minor

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
index 181995f1f2dac5e0c039dc62fb6b7c6ccc310a73..b328a10ba10d765cd4639d09db85fe4918e457d5 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
@@ -326,7 +326,7 @@ public class TaxonPortalController extends TaxonController
         }
         ModelAndView mv = new ModelAndView();
         Taxon taxon = getCdmBaseInstance(Taxon.class, uuid, response, (List<String>)null);
-        Map<String, List<?>> synonymy = new Hashtable<String, List<?>>();
+        Map<String, List<?>> synonymy = new Hashtable<>();
 
         //new
         List<List<Synonym>> synonymyGroups = service.getSynonymsByHomotypicGroup(taxon, SYNONYMY_INIT_STRATEGY);

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/HibernateProxyBeanProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/HibernateProxyBeanProcessor.java
index 658877d584665914a589bf8126403d563913f8d1..57efc586ee2f28768a2617541a4731020ce88b70 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/HibernateProxyBeanProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/HibernateProxyBeanProcessor.java
@@ -4,15 +4,14 @@
  */\r
 package eu.etaxonomy.cdm.remote.json.processor.bean;\r
 \r
+import org.apache.log4j.Logger;\r
+\r
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;\r
 import net.sf.json.CycleSetAcess;\r
 import net.sf.json.JSONObject;\r
 import net.sf.json.JsonConfig;\r
 import net.sf.json.processors.JsonBeanProcessor;\r
 \r
-import org.apache.log4j.Logger;\r
-\r
-import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;\r
-\r
 /**\r
  * @author a.kohlbecker\r
  */\r
@@ -20,9 +19,6 @@ public class HibernateProxyBeanProcessor extends CycleSetAcess implements JsonBe
 \r
        public static final Logger logger = Logger.getLogger(HibernateProxyBeanProcessor.class);\r
 \r
-       /* (non-Javadoc)\r
-        * @see net.sf.json.processors.JsonBeanProcessor#processBean(java.lang.Object, net.sf.json.JsonConfig)\r
-        */\r
        @Override\r
     public JSONObject processBean(Object bean, JsonConfig jsonConfig) {\r
                Object target = HibernateProxyHelper.deproxy(bean, Object.class);\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNameBaseBeanProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNameBaseBeanProcessor.java
index dcb9dfc800608dc16d1b48cb095daf0e06481593..2c5cae00c7c83ddc176af2e96cf3bca7b3ffc072 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNameBaseBeanProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNameBaseBeanProcessor.java
@@ -13,13 +13,12 @@ package eu.etaxonomy.cdm.remote.json.processor.bean;
 import java.util.Arrays;
 import java.util.List;
 
-import net.sf.json.JSONObject;
-import net.sf.json.JsonConfig;
-
 import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import net.sf.json.JSONObject;
+import net.sf.json.JsonConfig;
 
 /**
  * @author a.kohlbecker
@@ -45,9 +44,6 @@ public class TaxonNameBaseBeanProcessor extends AbstractCdmBeanProcessor<TaxonNa
         this.skipTaggedName = skipTaggedName;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.remote.json.processor.AbstractCdmBeanProcessor#getIgnorePropNames()
-     */
     @Override
     public List<String> getIgnorePropNames() {
         return Arrays.asList(new String[]{
@@ -63,9 +59,6 @@ public class TaxonNameBaseBeanProcessor extends AbstractCdmBeanProcessor<TaxonNa
         });
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.remote.json.processor.AbstractCdmBeanProcessor#processBeanSecondStage(java.lang.Object, net.sf.json.JSONObject, net.sf.json.JsonConfig)
-     */
     @Override
     public JSONObject processBeanSecondStep(TaxonNameBase bean, JSONObject json, JsonConfig jsonConfig) {
         if(logger.isDebugEnabled()){

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNameDescriptionBeanProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNameDescriptionBeanProcessor.java
index 6aacb3ff098a72473d481fb213aff537438bd127..ab07df0ee04a226fe95b57b4f929dec213825ff4 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNameDescriptionBeanProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNameDescriptionBeanProcessor.java
@@ -1,9 +1,9 @@
 // $Id$\r
 /**\r
 * Copyright (C) 2009 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
@@ -11,9 +11,9 @@ package eu.etaxonomy.cdm.remote.json.processor.bean;
 \r
 import java.util.List;\r
 \r
+import eu.etaxonomy.cdm.model.description.TaxonNameDescription;\r
 import net.sf.json.JSONObject;\r
 import net.sf.json.JsonConfig;\r
-import eu.etaxonomy.cdm.model.description.TaxonNameDescription;\r
 \r
 /**\r
  * @author a.kohlbecker\r
@@ -22,17 +22,11 @@ import eu.etaxonomy.cdm.model.description.TaxonNameDescription;
  */\r
 public class TaxonNameDescriptionBeanProcessor extends AbstractCdmBeanProcessor<TaxonNameDescription> {\r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.remote.json.processor.bean.AbstractCdmBeanProcessor#getIgnorePropNames()\r
-        */\r
        @Override\r
        public List<String> getIgnorePropNames() {\r
                return null;\r
        }\r
-       \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.remote.json.processor.bean.AbstractCdmBeanProcessor#processBeanSecondStep(eu.etaxonomy.cdm.model.common.CdmBase, net.sf.json.JSONObject, net.sf.json.JsonConfig)\r
-        */\r
+\r
        @Override\r
        public JSONObject processBeanSecondStep(TaxonNameDescription bean,\r
                        JSONObject json, JsonConfig jsonConfig) {\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeBeanProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeBeanProcessor.java
index da7795db45debac66411a23a6fa1db5b8dfb81ff..22f912beb6056292dbb683645fa1af1473dff15d 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeBeanProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeBeanProcessor.java
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -13,12 +13,11 @@ package eu.etaxonomy.cdm.remote.json.processor.bean;
 import java.util.Arrays;
 import java.util.List;
 
-import net.sf.json.JSONObject;
-import net.sf.json.JsonConfig;
-
 import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import net.sf.json.JSONObject;
+import net.sf.json.JsonConfig;
 
 /**
  * @author n.hoffmann
@@ -26,22 +25,16 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
  * @version 1.0
  */
 public class TaxonNodeBeanProcessor extends AbstractCdmBeanProcessor<TaxonNode> {
-       
+
        private static final Logger logger = Logger.getLogger(TaxonNodeBeanProcessor.class);
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.remote.json.processor.AbstractCdmBeanProcessor#getIgnorePropNames()
-        */
        @Override
-       public List getIgnorePropNames() {
+       public List<String> getIgnorePropNames() {
                return Arrays.asList(new String[]{
                                "parent", //TODO put in json-config ignore list ?
                });
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.remote.json.processor.AbstractCdmBeanProcessor#processBeanSecondStep(eu.etaxonomy.cdm.model.common.CdmBase, net.sf.json.JSONObject, net.sf.json.JsonConfig)
-        */
        @Override
        public JSONObject processBeanSecondStep(TaxonNode bean, JSONObject json,
                        JsonConfig jsonConfig) {

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonRelationshipBeanProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonRelationshipBeanProcessor.java
index aa8a6a15486ea6a6a1df85c3467b60384624fbae..7e76a5217cb8df238f7d33bec6925146bb0ac495 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonRelationshipBeanProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonRelationshipBeanProcessor.java
@@ -11,9 +11,9 @@ package eu.etaxonomy.cdm.remote.json.processor.bean;
 \r
 import java.util.List;\r
 \r
+import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;\r
 import net.sf.json.JSONObject;\r
 import net.sf.json.JsonConfig;\r
-import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;\r
 \r
 /**\r
  * @author a.kohlbecker\r
@@ -22,17 +22,11 @@ import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
  */\r
 public class TaxonRelationshipBeanProcessor extends AbstractCdmBeanProcessor<TaxonRelationship> {\r
 \r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.remote.json.processor.AbstractCdmBeanProcessor#getIgnorePropNames()\r
-     */\r
     @Override\r
     public List<String> getIgnorePropNames() {\r
         return null;\r
     }\r
 \r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.remote.json.processor.AbstractCdmBeanProcessor#processBeanSecondStep(eu.etaxonomy.cdm.model.common.CdmBase, net.sf.json.JSONObject, net.sf.json.JsonConfig)\r
-     */\r
     @Override\r
     public JSONObject processBeanSecondStep(TaxonRelationship bean, JSONObject json, JsonConfig jsonConfig) {\r
 \r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TreeNodeBeanProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TreeNodeBeanProcessor.java
index b59969e2932622cd3644d501739b6a61ec7ef055..3451727cd9bd45ca7b52fc375a6f96c49aa0f1f7 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TreeNodeBeanProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TreeNodeBeanProcessor.java
@@ -12,10 +12,10 @@ package eu.etaxonomy.cdm.remote.json.processor.bean;
 import java.util.Collection;
 import java.util.List;
 
+import eu.etaxonomy.cdm.common.TreeNode;
 import net.sf.json.JSONException;
 import net.sf.json.JSONObject;
 import net.sf.json.JsonConfig;
-import eu.etaxonomy.cdm.common.TreeNode;
 
 /**
  * @author a.kohlbecker
@@ -24,18 +24,12 @@ import eu.etaxonomy.cdm.common.TreeNode;
  */
 public class TreeNodeBeanProcessor extends AbstractBeanProcessor<TreeNode> {
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.remote.json.processor.bean.AbstractBeanProcessor#getIgnorePropNames()
-     */
     @Override
-    public List getIgnorePropNames() {
+    public List<String> getIgnorePropNames() {
         // nothing to ignore by default
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.remote.json.processor.bean.AbstractBeanProcessor#processBeanSecondStep(java.lang.Object, net.sf.json.JSONObject, net.sf.json.JsonConfig)
-     */
     @Override
     @SuppressWarnings("rawtypes")
     public JSONObject processBeanSecondStep(TreeNode bean, JSONObject json, JsonConfig jsonConfig) {

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/ClassJSONValueProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/ClassJSONValueProcessor.java
index 74a7bdfdbc140b42af752f539125e9abe4dd011e..4b5bfc54e397ea638b2893a8552dd0aee6a3652a 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/ClassJSONValueProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/ClassJSONValueProcessor.java
@@ -2,39 +2,41 @@
 /**\r
  * Copyright (C) 2009 EDIT 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\r
  * 1.1 See LICENSE.TXT at the top of this package for the full license terms.\r
  */\r
 \r
 package eu.etaxonomy.cdm.remote.json.processor.value;\r
 \r
+import org.apache.log4j.Logger;\r
+\r
 import net.sf.json.JsonConfig;\r
 import net.sf.json.processors.JsonValueProcessor;\r
 \r
-import org.apache.log4j.Logger;\r
-\r
 public class ClassJSONValueProcessor implements JsonValueProcessor {\r
-       \r
+\r
        private static final Logger logger = Logger.getLogger(ClassJSONValueProcessor.class);\r
 \r
+       @Override\r
        public Object processArrayValue(Object obj, JsonConfig jsonConfig) {\r
                logger.debug("Processing Class");\r
                if(obj == null){\r
                        return "";\r
                }\r
-               Class clazz = (Class) obj;\r
+               Class<?> clazz = (Class<?>) obj;\r
                return clazz.getSimpleName();\r
        }\r
 \r
-       public Object processObjectValue(String key, Object obj,\r
+       @Override\r
+    public Object processObjectValue(String key, Object obj,\r
                        JsonConfig jsonConfig) {\r
                logger.debug("Processing Class");\r
                if(obj == null){\r
                        return "";\r
                }\r
-               Class clazz = (Class) obj;\r
+               Class<?> clazz = (Class<?>) obj;\r
                return clazz.getSimpleName();\r
-       };\r
+       }\r
 \r
 }\r