From e84df9b01fb7e02761580d1acffc3d27d762e3a4 Mon Sep 17 00:00:00 2001
From: bencomp <ben@companjen.name>
Date: Mon, 22 Sep 2014 16:38:56 +0200
Subject: [PATCH 1/3] Add generics to instantiations in Dataverse class

---
 src/main/java/edu/harvard/iq/dataverse/Dataverse.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
index 84f6e8ef967..e4378b6f803 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
@@ -72,11 +72,11 @@ public class Dataverse extends DvObjectContainer {
     private boolean facetRoot;
 
     @OneToMany(cascade = {CascadeType.MERGE})
-    private List<MetadataBlock> metadataBlocks = new ArrayList();
+    private List<MetadataBlock> metadataBlocks = new ArrayList<MetadataBlock>();
 
     @OneToMany(mappedBy = "dataverse")
     @OrderBy("displayOrder")
-    private List<DataverseFacet> dataverseFacets = new ArrayList();
+    private List<DataverseFacet> dataverseFacets = new ArrayList<DataverseFacet>();
     
     public enum ImageFormat { SQUARE, RECTANGLE }
 
@@ -287,7 +287,7 @@ public Set<DataverseRole> getRoles() {
     }
 
     public List<Dataverse> getOwners() {
-        List owners = new ArrayList();
+        List<Dataverse> owners = new ArrayList<Dataverse>();
         if (getOwner() != null) {
             owners.addAll(getOwner().getOwners());
             owners.add(getOwner());

From 680845c9b698ef5d9069ce6aa73480230c53cd9b Mon Sep 17 00:00:00 2001
From: Ben Companjen <ben@companjen.name>
Date: Wed, 24 Sep 2014 01:37:31 +0200
Subject: [PATCH 2/3] Compare Strings with empty string using equals() instead
 of ==

---
 .../edu/harvard/iq/dataverse/ingest/IngestServiceBean.java  | 2 +-
 .../edu/harvard/iq/dataverse/util/ShapefileHandler.java     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
index 71b411bc0d7..0f136fb7660 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
@@ -521,7 +521,7 @@ private String getContentType(File fileObject){
             contentType = null;
         }
 
-        if ((contentType==null)||(contentType=="")){
+        if ((contentType==null)||(contentType.equals(""))){
             contentType = "MIME_TYPE_UNDETERMINED_DEFAULT";
         }
         return contentType;
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/ShapefileHandler.java b/src/main/java/edu/harvard/iq/dataverse/util/ShapefileHandler.java
index 6892f64c994..a12a83d1a38 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/ShapefileHandler.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/ShapefileHandler.java
@@ -290,7 +290,7 @@ private String getFileBasename(String fileName){
             return null;
         }
         String unzipFileName = new File(fileName).getName();
-        if (unzipFileName==""){
+        if (unzipFileName.equals("")){
             logger.info("getFileBasename.  fileName is an empty string: " + fileName);
             return null;
         }
@@ -464,7 +464,7 @@ private String getRedistributeFilePath(String dirname, String file_basename, Str
             this.addErrorMessage("getRedistributeFilePath. file_ext is null");
             return null;
         }
-        if (file_ext == BLANK_EXTENSION ){
+        if (file_ext.equals(BLANK_EXTENSION)){
             return dirname + "/" + file_basename;
         }
         return dirname + "/" + file_basename + "." + file_ext;
@@ -649,7 +649,7 @@ private void updateFileGroupHash(String fname){
     } // end updateFileGroupHash
     
     private boolean isFileToSkip(String fname){
-        if ((fname==null)||(fname=="")){
+        if ((fname==null)||(fname.equals(""))){
             return true;
         }
         

From cfe606b9abc847ad141f0f722de71e3dfe9f0d9c Mon Sep 17 00:00:00 2001
From: bencomp <ben@companjen.name>
Date: Mon, 22 Sep 2014 16:38:56 +0200
Subject: [PATCH 3/3] Add generics to instantiations in Dataverse class

---
 src/main/java/edu/harvard/iq/dataverse/Dataverse.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
index 0a9adb4de59..5145a1a1587 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
@@ -126,11 +126,11 @@ public void setDefaultContributorRole(DataverseRole defaultContributorRole) {
     private DataverseTheme dataverseTheme;
 
     @OneToMany(cascade = {CascadeType.MERGE})
-    private List<MetadataBlock> metadataBlocks = new ArrayList();
+    private List<MetadataBlock> metadataBlocks = new ArrayList<MetadataBlock>();
 
     @OneToMany(mappedBy = "dataverse")
     @OrderBy("displayOrder")
-    private List<DataverseFacet> dataverseFacets = new ArrayList();
+    private List<DataverseFacet> dataverseFacets = new ArrayList<DataverseFacet>();
     
     @OneToMany(mappedBy = "dataverse")
     private List<DataverseFieldTypeInputLevel> dataverseFieldTypeInputLevels = new ArrayList();
@@ -366,7 +366,7 @@ public Set<DataverseRole> getRoles() {
     }
 
     public List<Dataverse> getOwners() {
-        List owners = new ArrayList();
+        List<Dataverse> owners = new ArrayList<Dataverse>();
         if (getOwner() != null) {
             owners.addAll(getOwner().getOwners());
             owners.add(getOwner());