cleanup

diff --git a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/occurrence/gbif/GbifJsonOccurrenceParser.java b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/occurrence/gbif/GbifJsonOccurrenceParser.java
index 91c76f87c511a96d15befc4ce7dc2611acaa3e47..26afd092b4f7b23a4ffad3deaec15803fc64edf5 100644 (file)
--- a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/occurrence/gbif/GbifJsonOccurrenceParser.java
+++ b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/occurrence/gbif/GbifJsonOccurrenceParser.java
@@ -410,16 +410,12 @@ public class GbifJsonOccurrenceParser {
                     //http://ww2.bgbm.org/herbarium/images/B/-W/08/53/B_-W_08537%20-00%201__3.jpg
                     JSONArray multimediaArray = record.getJSONArray(MULTIMEDIA);
                     JSONObject mediaRecord;
-                    Media media;
-                    URI uri = null;
-                    CdmImageInfo imageInf = null;
-                    MediaRepresentation representation = null;
                     SpecimenOrObservationType type = null;
                     for(Object object:multimediaArray){
                         //parse every record
-                       media = Media.NewInstance();
-                       uri = null;
-                       imageInf = null;
+                        Media media = Media.NewInstance();
+                        URI uri = null;
+                        CdmImageInfo imageInf = null;
 
                         if(object instanceof JSONObject){
                             mediaRecord = (JSONObject) object;
@@ -449,7 +445,7 @@ public class GbifJsonOccurrenceParser {
                             }
                         }
                         ImageFile imageFile = ImageFile.NewInstance(uri, null, imageInf);
-                        representation = MediaRepresentation.NewInstance();
+                        MediaRepresentation representation = MediaRepresentation.NewInstance();
 
                         representation.addRepresentationPart(imageFile);
                         media.addRepresentation(representation);

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java
index 071aa4ad1e5c844a6fd56fc54e2e0e7dc7b60f77..d42bed171c2073a5b41bf770d8a4cdc1780c8021 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java
@@ -1427,12 +1427,6 @@ public abstract class CdmImportBase<CONFIG extends IImportConfigurator, STATE ex
                }
        }
 
-    /**
-     * @param uriString
-     * @param readMediaData
-     * @return
-     * @throws URISyntaxException
-     */
     private MediaRepresentation makeMediaRepresentation(String uriString, boolean readMediaData) throws URISyntaxException {
         uriString = uriString.replace(" ", "%20");  //replace whitespace
         CdmImageInfo cdmImageInfo = null;

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java
index 1324aac426a12c3408f93c1c2ffe5449d90d62d4..c66c0d2d11d0c2643cbb2b011cbdf3271d780034 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java
@@ -1567,7 +1567,8 @@ public class SDDImport extends XmlImportBase<SDDImportConfigurator, SDDImportSta
 \r
                if (elMediaObjects != null) {\r
                        // <MediaObject id="m1">\r
-                       List<Element> listMediaObjects = elMediaObjects.getChildren("MediaObject", sddNamespace);\r
+                       @SuppressWarnings("unchecked")\r
+            List<Element> listMediaObjects = elMediaObjects.getChildren("MediaObject", sddNamespace);\r
                        int j = 0;\r
                        for (Element elMO : listMediaObjects){\r
 \r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/iiif/ManifestComposer.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/iiif/ManifestComposer.java
index 965dc8cb22a08f09d9d466cec56cd9cb0f113ef4..7824ec7f3a0177d681f675952a2fec55c28016cb 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/iiif/ManifestComposer.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/iiif/ManifestComposer.java
@@ -442,7 +442,6 @@ public class ManifestComposer {
         List<MetadataEntry> metadata = new ArrayList<>();
         List<Language> languages = LocaleContext.getLanguages();
 
-
         if(media.getTitle() != null){
             // TODO get localized titleCache
             metadata.add(new MetadataEntry("Title", media.getTitleCache()));

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/media/MediaUriTransformation.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/media/MediaUriTransformation.java
index adc0416c46df418e084ba20fa7f9710c16932301..474af796803dfe7a8ba4f75717d941fdc15798b6 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/media/MediaUriTransformation.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/media/MediaUriTransformation.java
@@ -32,12 +32,7 @@ public class MediaUriTransformation {
     Integer height = null;
     boolean isMaxExtend = false;
 
-    /**
-     *
-     */
-    public MediaUriTransformation() {
-
-    }
+    public MediaUriTransformation() {}
 
     public SearchReplace getScheme() {
         return scheme;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/media/SearchReplace.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/media/SearchReplace.java
index 97bdb63391b7739bfb4875a4cdbab33689889f0a..0306963d9b156fee969b3a0cfa92c93a47dcfc85 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/media/SearchReplace.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/media/SearchReplace.java
@@ -63,4 +63,11 @@ public class SearchReplace {
         return searchPattern;
     }
 
+    @Override
+    public String toString() {
+        return "SearchReplace [replace=" + replace + ", search=" + search + ", searchPattern=" + searchPattern + "]";
+    }
+
+
+
 }
\ No newline at end of file