cleanup

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionMapper.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionMapper.java
index b8d2adf3589a2fde2bbe86375bbd7f09831ea130..9f663cfa65225e84fd7b301f7a7c7352dd53084c 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionMapper.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionMapper.java
@@ -1,8 +1,8 @@
 /**\r
 * Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
 * http://www.e-taxonomy.eu\r
-* \r
+*\r
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
@@ -35,13 +35,13 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
  * as it does not map to a single attribute\r
  * @author a.mueller\r
  * @created 12.05.2009\r
- * @version 1.0\r
  */\r
-public class DbImportExtensionMapper extends DbSingleAttributeImportMapperBase<DbImportStateBase<?,?>, IdentifiableEntity> implements IDbImportMapper<DbImportStateBase<?,?>,IdentifiableEntity>{\r
+public class DbImportExtensionMapper extends DbSingleAttributeImportMapperBase<DbImportStateBase<?,?>, IdentifiableEntity>\r
+        implements IDbImportMapper<DbImportStateBase<?,?>,IdentifiableEntity>{\r
        private static final Logger logger = Logger.getLogger(DbImportExtensionMapper.class);\r
-       \r
+\r
 //************************** FACTORY METHODS ***************************************************************/\r
-       \r
+\r
        /**\r
         * @param dbAttributeString\r
         * @param uuid\r
@@ -54,13 +54,13 @@ public class DbImportExtensionMapper extends DbSingleAttributeImportMapperBase<D
        public static DbImportExtensionMapper NewInstance(String dbAttributeString, UUID uuid, String label, String text, String labelAbbrev){\r
                return new DbImportExtensionMapper(dbAttributeString, uuid, label, text, labelAbbrev);\r
        }\r
-       \r
+\r
        public static DbImportExtensionMapper NewInstance(String dbAttributeString, ExtensionType extensionType){\r
                return new DbImportExtensionMapper(dbAttributeString, extensionType);\r
        }\r
-       \r
+\r
 //***************** VARIABLES **********************************************************/\r
-       \r
+\r
        private ExtensionType extensionType;\r
        private String label;\r
        private String text;\r
@@ -82,7 +82,7 @@ public class DbImportExtensionMapper extends DbSingleAttributeImportMapperBase<D
                this.text = text;\r
                this.labelAbbrev = labelAbbrev;\r
        }\r
-       \r
+\r
        /**\r
         * @param dbAttributeString\r
         * @param extensionType\r
@@ -91,20 +91,17 @@ public class DbImportExtensionMapper extends DbSingleAttributeImportMapperBase<D
                super(dbAttributeString, dbAttributeString);\r
                this.extensionType = extensionType;\r
        }\r
-       \r
+\r
 //****************************** METHODS ***************************************************/\r
-       \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.mapping.DbSingleAttributeImportMapperBase#initialize(eu.etaxonomy.cdm.io.common.DbImportStateBase, java.lang.Class)\r
-        */\r
+\r
        @Override\r
        public void initialize(DbImportStateBase<?,?> state, Class<? extends CdmBase> destinationClass) {\r
                importMapperHelper.initialize(state, destinationClass);\r
                CdmImportBase<?, ?> currentImport = state.getCurrentIO();\r
                if (currentImport == null){\r
-                       throw new IllegalStateException("Current import is not available. Please make sure the the state knows about the current import (state.setCurrentImport())) !"); \r
+                       throw new IllegalStateException("Current import is not available. Please make sure the the state knows about the current import (state.setCurrentImport())) !");\r
                }\r
-               \r
+\r
                try {\r
                        if (  checkDbColumnExists()){\r
                                if (this.extensionType == null){\r
@@ -117,7 +114,7 @@ public class DbImportExtensionMapper extends DbSingleAttributeImportMapperBase<D
                        //do nothing  - checkDbColumnExists is not possible\r
                }\r
        }\r
-       \r
+\r
 \r
        /**\r
         * @param valueMap\r
@@ -129,7 +126,7 @@ public class DbImportExtensionMapper extends DbSingleAttributeImportMapperBase<D
                String dbValue = dbValueObject == null? null: dbValueObject.toString();\r
                return invoke(dbValue, cdmBase);\r
        }\r
-       \r
+\r
        /**\r
         * @param dbValue\r
         * @param cdmBase\r
@@ -146,17 +143,15 @@ public class DbImportExtensionMapper extends DbSingleAttributeImportMapperBase<D
                }else{\r
                        throw new IllegalArgumentException("extended object must be of type identifiable entity.");\r
                }\r
-               \r
+\r
        }\r
-       \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.mapping.DbSingleAttributeImportMapperBase#invoke(java.sql.ResultSet, eu.etaxonomy.cdm.model.common.CdmBase)\r
-        */\r
-       public IdentifiableEntity invoke(ResultSet rs, IdentifiableEntity identifiableEntity) throws SQLException {\r
+\r
+       @Override\r
+    public IdentifiableEntity invoke(ResultSet rs, IdentifiableEntity identifiableEntity) throws SQLException {\r
                String dbValue = rs.getString(getSourceAttribute());\r
                return invoke(dbValue, identifiableEntity);\r
        }\r
-       \r
+\r
        /**\r
         * @param dbValue\r
         * @param identifiableEntity\r
@@ -174,8 +169,8 @@ public class DbImportExtensionMapper extends DbSingleAttributeImportMapperBase<D
                }\r
                return identifiableEntity;\r
        }\r
-       \r
-       \r
+\r
+\r
        /**\r
         * @param service\r
         * @param uuid\r
@@ -210,13 +205,9 @@ public class DbImportExtensionMapper extends DbSingleAttributeImportMapperBase<D
 \r
 \r
        //not used\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.CdmSingleAttributeMapperBase#getTypeClass()\r
-        */\r
-       public Class<String> getTypeClass(){\r
+       @Override\r
+    public Class<String> getTypeClass(){\r
                return String.class;\r
        }\r
 \r
-       \r
-\r
 }\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/TeamOrPersonBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/TeamOrPersonBase.java
index 8cce506cf74da330e605b323fc41ab0dbb820463..4fee36b63e75cba0f68b55ee6f4ccff0ad70c109 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/TeamOrPersonBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/TeamOrPersonBase.java
@@ -87,9 +87,7 @@ public abstract class TeamOrPersonBase<T extends TeamOrPersonBase<?>> extends Ag
         this.nomenclaturalTitle = StringUtils.isBlank(nomenclaturalTitle) ? null : nomenclaturalTitle;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.model.common.IdentifiableEntity#getTitleCache()
-     */
+
     @Override
     @Transient /*
                 TODO  is the transient annotation still needed, can't we remove this ??

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextFormat.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextFormat.java
index 6ef739fa89c48da2d0ccf42d6811a821904afea4..8c28761e30b08e56b32e5d5b5b0095ac3b296140 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextFormat.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextFormat.java
@@ -97,9 +97,6 @@ public class TextFormat extends DefinedTermBase<TextFormat> {
 //********* METHODS **************************************/
 
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.model.common.DefinedTermBase#resetTerms()
-        */
        @Override
        public void resetTerms(){
                termMap = null;
@@ -107,7 +104,7 @@ public class TextFormat extends DefinedTermBase<TextFormat> {
 
        @Override
        protected void setDefaultTerms(TermVocabulary<TextFormat> termVocabulary){
-               termMap = new HashMap<UUID, TextFormat>();
+               termMap = new HashMap<>();
                for (TextFormat term : termVocabulary.getTerms()){
                        termMap.put(term.getUuid(), term);
                }

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/media/MediaDefaultCacheStrategy.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/media/MediaDefaultCacheStrategy.java
index 5252903a628dd2561467a304535eca5dec13c08d..8c42f5fa4feef3f313cd3dfbe3abaffd76c77bb8 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/media/MediaDefaultCacheStrategy.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/media/MediaDefaultCacheStrategy.java
@@ -5,7 +5,7 @@
 *\r
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
-*/ \r
+*/\r
 \r
 package eu.etaxonomy.cdm.strategy.cache.media;\r
 \r
@@ -35,24 +35,25 @@ public class MediaDefaultCacheStrategy extends StrategyBase implements IIdentifi
        public static MediaDefaultCacheStrategy NewInstance() {\r
                return new MediaDefaultCacheStrategy();\r
        }\r
-       \r
+\r
        @Override\r
        protected UUID getUuid() {\r
-               return uuid; \r
+               return uuid;\r
        }\r
-       \r
-       \r
-       public String getTitleCache(Media media) {\r
-               media = (Media) HibernateProxyHelper.deproxy(media, Media.class);\r
+\r
+\r
+       @Override\r
+    public String getTitleCache(Media media) {\r
+               media = HibernateProxyHelper.deproxy(media, Media.class);\r
                return getTitleCacheByLanguage(media, Language.DEFAULT());\r
        }\r
-       \r
+\r
        public String getTitleCacheByLanguage(Media media, Language lang) {\r
                String result;\r
                List<Language> languages = Arrays.asList(new Language[]{lang});\r
                LanguageString languageString = MultilanguageTextHelper.getPreferredLanguageString(media.getAllTitles(), languages);\r
                result = (languageString != null ? languageString.getText() : "");\r
-               \r
+\r
                //get first image uri\r
                if (StringUtils.isBlank(result)){\r
                        for (MediaRepresentation mediaRepresentation : media.getRepresentations()){\r
@@ -79,5 +80,5 @@ public class MediaDefaultCacheStrategy extends StrategyBase implements IIdentifi
        }\r
 \r
 \r
-       \r
+\r
 }\r