cleanup

diff --git a/.gitattributes b/.gitattributes
index 72920e50315d0a3bafe2723d6654e1aa084fa4a8..8e7f9d0c75168374be196384005bfc217e914af1 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -191,7 +191,6 @@ eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-4.2.0.Final.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-analyzers-4.2.0.Final.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-4.2.0.Final.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-4.2.0.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-1.8.0.10.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/icu4j-2.6.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT.jar -text

diff --git a/eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml b/eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml
index b402e67285da2986b850d3c49dd670ae7c225c13..6ee552034f7130da9603ec3f5db601a2148f9298 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml
+++ b/eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml
@@ -3,9 +3,9 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
   xmlns:context="http://www.springframework.org/schema/context"\r
   xmlns:tx="http://www.springframework.org/schema/tx"\r
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
-    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd\r
-    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">\r
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd\r
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd\r
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">\r
 \r
   <!-- Local application context and term initializer -->\r
   <import resource="classpath:/eu/etaxonomy/cdm/localApplicationContext.xml"/>\r

diff --git a/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/NameProtectTitleCacheTest.java b/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/NameProtectTitleCacheTest.java
index 8c54e23c1e08b5345db545c75dab3740a6524a66..be43af0fc20398d058b49281da8867f822a5c5cc 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/NameProtectTitleCacheTest.java
+++ b/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/NameProtectTitleCacheTest.java
@@ -6,10 +6,8 @@
 * 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.
 */
-
 package eu.etaxonomy.taxeditor.store;
 
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -29,17 +27,13 @@ public class NameProtectTitleCacheTest /*extends CdmIntegrationTest */{
 
 //     @SpringBeanByType
        @SuppressWarnings("unused")
-       private CdmStore cdmStore;// = CdmStore.getDefault();
-       
+       private CdmStore cdmStore;// = CdmStore.getDefault();   
        
        @SuppressWarnings("unused")
        private ConversationHolder conversation;
 
        private INonViralName name;
-       
-       /**
-        * @throws java.lang.Exception
-        */
+
        @Before
        public void setUp() throws Exception {
                
@@ -51,9 +45,6 @@ public class NameProtectTitleCacheTest /*extends CdmIntegrationTest */{
                name.setSpecificEpithet("mama");
        }
        
-       /**
-        * 
-        */
        @Test
        public void testProtectTitleCache(){
                Assert.assertTrue(name.isProtectedTitleCache() == false);

diff --git a/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/operations/AbstractTaxeditorOperationTestBase.java b/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/operations/AbstractTaxeditorOperationTestBase.java
index 3d55b3595a4dd4cb3628e94966908d32d3c20dc3..542e13f93480eb4eda25015f025204d7a4cf8eb5 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/operations/AbstractTaxeditorOperationTestBase.java
+++ b/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/operations/AbstractTaxeditorOperationTestBase.java
@@ -6,7 +6,6 @@
 * 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.
 */
-
 package eu.etaxonomy.taxeditor.store.operations;
 
 import org.eclipse.core.commands.operations.IUndoContext;
@@ -21,7 +20,6 @@ import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
 /**
  * @author n.hoffmann
  * @created 15.04.2009
- * @version 1.0
  */
 public abstract class AbstractTaxeditorOperationTestBase {
 
@@ -34,4 +32,4 @@ public abstract class AbstractTaxeditorOperationTestBase {
 
        protected static AbstractPostTaxonOperation operation;
        protected static Taxon taxon;
-}
+}
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/operations/RemotingTestUpdateOperation.java b/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/operations/RemotingTestUpdateOperation.java
index 1233bb086e19e5001e1df8e8f2eadf1d74cb8a2b..cf7bb3cfd1ef258c1d93f489e1f43258fe607109 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/operations/RemotingTestUpdateOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/operations/RemotingTestUpdateOperation.java
@@ -63,5 +63,4 @@ public class RemotingTestUpdateOperation extends RemotingCdmUpdateOperation {
         }
         return null;
     }
-
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/utility/AbstractUtilityTest.java b/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/utility/AbstractUtilityTest.java
index 99826d0eb26efbc1455473374e9abb59ef2c3353..8d164f25daf0c6410cd63c397623b3252c5ecf66 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/utility/AbstractUtilityTest.java
+++ b/eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/utility/AbstractUtilityTest.java
@@ -55,10 +55,6 @@ public class AbstractUtilityTest {
         check(orderedTerms, Arrays.asList(TermType.values()));
     }
 
-    /**
-     * @param orderedTerms
-     * @param expectedTerms
-     */
     private void check(LinkedHashMap<? extends IEnumTerm<?>, String> orderedTerms, Collection<? extends IEnumTerm<?>> expectedTerms) {
         assertFalse("Ordered term list is empty!", orderedTerms.isEmpty());
         assertEquals("Some terms got lost while ordering.", expectedTerms.size(), orderedTerms.size());