cleanup

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/EntityListener.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/EntityListener.java
index d26cef95fa285478ff91a2d33e6915f55411e242..b74947e17aeb7e0b1c7724de1a681ef3d0cfedc3 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/EntityListener.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/EntityListener.java
@@ -12,7 +12,8 @@ package eu.etaxonomy.taxeditor.annotatedlineeditor;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
-import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 /**
  * <p>Abstract EntityListener class.</p>

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/handler/OpenRelatedConceptInBulkEditorHandlerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/handler/OpenRelatedConceptInBulkEditorHandlerE4.java
index 76ef1b04264a2a5e4967bb4e88c267c2368ee1a2..dd1eb4b07b67c2c72f67d86b64a9dde09c3c5a6f 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/handler/OpenRelatedConceptInBulkEditorHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/handler/OpenRelatedConceptInBulkEditorHandlerE4.java
@@ -9,12 +9,10 @@ import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil;
 import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput;
 
 public class OpenRelatedConceptInBulkEditorHandlerE4 extends OpenRelatedConceptHandlerE4{
-    /**
-     * {@inheritDoc}
-     */
+
     @Override
     protected void openConcept(TaxonBase<?> relatedTaxon, EModelService modelService, EPartService partService, MApplication application) {
         AbstractBulkEditorInput<?> input = AbstractBulkEditorInput.NewInstance(relatedTaxon);
         BulkEditorUtil.openBulkEditor(input, modelService, partService, application);
     }
-}
+}
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/handler/EditSequenceHandlerE4.java b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/handler/EditSequenceHandlerE4.java
index fd88c41b3732d3e5ea5a40009c05f8481c16ea8a..eb2e4f1c99922a946a06b6270db6d1b5abf0911c 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/handler/EditSequenceHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/handler/EditSequenceHandlerE4.java
@@ -1,8 +1,9 @@
 package eu.etaxonomy.taxeditor.molecular.editor.e4.handler;
 
-
 import javax.inject.Named;
 
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.eclipse.e4.core.di.annotations.CanExecute;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.core.di.annotations.Optional;
@@ -23,8 +24,6 @@ import eu.etaxonomy.taxeditor.molecular.editor.AlignmentEditorInput;
 import eu.etaxonomy.taxeditor.molecular.editor.e4.AlignmentEditorE4;
 import eu.etaxonomy.taxeditor.molecular.l10n.Messages;
 
-
-
 /**
  * Opens the alignment editor from the CDM tree.
  *
@@ -32,8 +31,8 @@ import eu.etaxonomy.taxeditor.molecular.l10n.Messages;
  * @author pplitzner
  */
 public class EditSequenceHandlerE4 {
-    private org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(EditSequenceHandlerE4.class);
-
+    
+       private Logger logger = LogManager.getLogger(EditSequenceHandlerE4.class);
 
     @Execute
     public void execute(@Optional@Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection,

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/OperationsUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/OperationsUtil.java
index 5b4508dfca3d560c1dde562f86c2090ee8f6c44a..dfb59a48fca2d481ee13f0c036b849d1eb3ccda5 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/OperationsUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/OperationsUtil.java
@@ -17,12 +17,11 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
 /**
  * @author cmathew
  * @date 29 Jun 2015
- *
  */
 public class OperationsUtil {
 
     public static List<UUID> convertToUuidList(List<CdmBase> cdmBaseList) {
-        List<UUID> uuids = new ArrayList<UUID>();
+        List<UUID> uuids = new ArrayList<>();
         for(CdmBase cdmBase : cdmBaseList) {
             if(cdmBase == null) {
                 uuids.add(null);

diff --git a/eu.etaxonomy.taxeditor/rcp.target b/eu.etaxonomy.taxeditor/rcp.target
index 206eb76191885e5a11bea7b38dee30ed0725f5fc..ee74eabef5f85bf5eb69a92008db8ca480ffb72d 100644 (file)
--- a/eu.etaxonomy.taxeditor/rcp.target
+++ b/eu.etaxonomy.taxeditor/rcp.target
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<?pde version="3.8"?><target includeMode="feature" name="Eclipse Neon Target" sequenceNumber="54">\r
+<?pde version="3.8"?>\r
+<target includeMode="feature" name="Eclipse Neon Target" sequenceNumber="54">\r
 <locations>\r
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">\r
 <unit id="org.eclipse.equinox.sdk.feature.group" version="3.12.0.v20170209-1843"/>\r
@@ -371,4 +372,4 @@
 <plugin id="org.eclipse.xtext.xtext.generator.source"/>\r
 <plugin id="org.hamcrest.library"/>\r
 </includeBundles>\r
-</target>\r
+</target>
\ No newline at end of file

diff --git a/setup-project.sh b/setup-project.sh
index 8a319709b1945ef26e9d9dbb5d78edf8fee28b82..8aa20be9ccd5602b42628b5e4fdac4232452af23 100755 (executable)
--- a/setup-project.sh
+++ b/setup-project.sh
@@ -4,6 +4,7 @@ echo -n "Clear eclipse project? [y,N]"
 read choice
 
 if [ "$choice" == "y" ]; then
+    #remove all ".classpath" and ".project" files and ".settings" folders
        find . -type f \( -name ".classpath" -o -name "*.project" \) -prune -exec rm -f {} \;
        find . -type d -name ".settings" -prune -exec rm -rf {} \;
 fi