Compare Strings using .equals() instead of ==
#935
Conversation
|
Yeah, this is embarrassing. So, what is the plan with these pull requests? Are we going to merge Alternatively, I can just go ahead and incorporate the changes below On 9/25/14 2:55 AM, bencomp wrote:
|
|
I incorporated the ShapefileHandler.java changes into my code. Same for the IngestServiceBean.java, there was an additional bug in the next line--both are checked in. |
That's fine. It means we can automatically merge the pull request, but that's ok. I think @bencomp is just trying to raise awareness.
I thought maybe this small one could get merged but again, I don't think @bencomp will be offended if we don't. @landreev maybe you can just close this request if you've already made your own changes to the code. I'll assign this pull request to you so you can decide. |
Conflicts: src/main/java/edu/harvard/iq/dataverse/Dataverse.java src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
| @@ -132,11 +132,11 @@ public void setDefaultContributorRole(DataverseRole defaultContributorRole) { | |||
| private List<DataverseContact> dataverseContacts = new ArrayList(); | |||
|
|
|||
| @OneToMany(cascade = {CascadeType.MERGE}) | |||
| private List<MetadataBlock> metadataBlocks = new ArrayList(); | |||
| private List<MetadataBlock> metadataBlocks = new ArrayList<MetadataBlock>(); | |||
There was a problem hiding this comment.
Equally, we could use diamond inference here, right? Like this: new ArrayList<>();
There was a problem hiding this comment.
Yes, you could. And in many other places ;)
|
My preference would be to use diamond inference, so I'm going to close this pull request. Note that @raprasad already merged in a lot of the other changes. See also #775 in which we are defining our coding standards in a Google doc for now, where public comments are enabled. |
This was a warning raised by the Inspector in IntelliJ IDEA.
(Plus some parametrised instantiations :))