cleanup

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/CheckBoxTreeComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/CheckBoxTreeComposite.java
index 7bdc81598984329854855f21507cce8f03db611a..72f77e24436e7dd71a74c17bba740456aa415b43 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/CheckBoxTreeComposite.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/CheckBoxTreeComposite.java
@@ -35,7 +35,6 @@ import eu.etaxonomy.taxeditor.model.ImageResources;
 /**
  * @author pplitzner
  * @since Oct 26, 2018
- *
  */
 public class CheckBoxTreeComposite extends Composite implements SelectionListener {
 
@@ -103,7 +102,6 @@ public class CheckBoxTreeComposite extends Composite implements SelectionListene
                         tempArray[checkedElements.length] = item.getData();
                         checkedElements = tempArray;
                     }
-
                 }else{
                     int index = 0;
                     if (checkedElements != null){
@@ -124,10 +122,8 @@ public class CheckBoxTreeComposite extends Composite implements SelectionListene
         viewer = new CdmCheckBoxTreeViewer(tree);
         viewer.setContentProvider(contentProvider);
         viewer.setLabelProvider(labelProvider);
-
     }
 
-
     private void updateItem(TreeItem treeItem){
         TreeItem parentItem = treeItem.getParentItem();
         if(parentItem!=null){
@@ -201,7 +197,6 @@ public class CheckBoxTreeComposite extends Composite implements SelectionListene
         for (TreeItem rootItem : rootItems) {
             updateItem(rootItem);
         }
-
     }
 
     /**
@@ -217,7 +212,6 @@ public class CheckBoxTreeComposite extends Composite implements SelectionListene
         for (TreeItem rootItem : rootItems) {
             updateItem(rootItem);
         }
-
     }
 
     @Override
@@ -266,5 +260,4 @@ public class CheckBoxTreeComposite extends Composite implements SelectionListene
     @Override
     public void widgetDefaultSelected(SelectionEvent e) {
     }
-
-}
+}
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeEditor.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeEditor.java
index 8db5038ca39072591515ede5cad289f630fc37c9..97082e868366e44c9579fb14a73a78cfba4049ca 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeEditor.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeEditor.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.termtree.e4;
 
 import java.util.ArrayList;
@@ -82,10 +81,8 @@ import eu.etaxonomy.taxeditor.termtree.e4.operation.CreateFeatureTreeOperation;
 import eu.etaxonomy.taxeditor.workbench.part.IE4ViewerPart;
 
 /**
- *
  * @author pplitzner
  * @date 06.06.2017
- *
  */
 public class TermTreeEditor<T extends DefinedTermBase>
                implements ITermTreeEditor, ISelectionChangedListener,
@@ -147,7 +144,7 @@ public class TermTreeEditor<T extends DefinedTermBase>
         }
         parent.setLayout(new FillLayout());
         viewer = new TreeViewer(parent);
-        TermTreeContentProvider contentProvider = new TermTreeContentProvider();
+        TermTreeContentProvider<?> contentProvider = new TermTreeContentProvider<>();
 
         viewer.setContentProvider(contentProvider);
         viewer.setLabelProvider(new TermTreeLabelProvider());
@@ -220,7 +217,6 @@ public class TermTreeEditor<T extends DefinedTermBase>
 //            AbstractUtility.executeOperation(operation, sync);
             this.addOperation(operation);
         }
-
     }
 
     public void copy(IStructuredSelection selection) {
@@ -248,6 +244,10 @@ public class TermTreeEditor<T extends DefinedTermBase>
         dirty.setDirty(false);
     }
 
+    @Override
+    public boolean isDirty(){
+        return dirty.isDirty();
+    }
        public void setDirty(boolean isDirty){
            this.dirty.setDirty(isDirty);
        }
@@ -256,11 +256,6 @@ public class TermTreeEditor<T extends DefinedTermBase>
         this.dirty.setDirty(true);
     }
 
-       @Override
-    public boolean isDirty(){
-           return dirty.isDirty();
-       }
-
        @Override
        public void selectionChanged(SelectionChangedEvent event) {
                //propagate selection
@@ -311,7 +306,6 @@ public class TermTreeEditor<T extends DefinedTermBase>
         }
 
         // commit the conversation and start a new transaction immediately
-        Object[] expandedElements = this.viewer.getExpandedElements();
         ISelection sel = this.viewer.getSelection();
         conversation.commit(true);
         if (createOperationList != null && !createOperationList.isEmpty()){
@@ -350,7 +344,6 @@ public class TermTreeEditor<T extends DefinedTermBase>
         updateTrees();
         viewer.setInput(getTrees());
         viewer.setExpandedElements(expandedElements);
-
     }
 
        @PreDestroy
@@ -371,8 +364,7 @@ public class TermTreeEditor<T extends DefinedTermBase>
                 "term", //$NON-NLS-1$
                 "termTree", //$NON-NLS-1$
         });
-        Map<Object, List<String>> propertyPathMap =
-                new HashMap<Object, List<String>>();
+        Map<Object, List<String>> propertyPathMap = new HashMap<>();
         propertyPathMap.put(TermNode.class,propertyPaths);
         return propertyPathMap;
     }
@@ -467,10 +459,6 @@ public class TermTreeEditor<T extends DefinedTermBase>
         }
     }
 
-    /**
-     * @param term
-     * @param treeUuid
-     */
     @Override
     public boolean checkDuplicates(UUID termUuid, UUID treeUuid) {
         TermTreeDto tree = this.getTreeDtoForUuid(treeUuid);
@@ -497,8 +485,6 @@ public class TermTreeEditor<T extends DefinedTermBase>
             addAllNodesToMap(tree.getRoot());
         }
         ((TermTreeContentProvider<T>)viewer.getContentProvider()).setUuidTermMap(uuidTermMap);
-//        viewer.refresh();
-
     }
 
     public List<TermTreeDto> getTrees(){
@@ -508,12 +494,10 @@ public class TermTreeEditor<T extends DefinedTermBase>
 
     public void putTree(TermTreeDto tree){
        trees.put(tree.getUuid(), tree);
-
     }
 
     public void removeTree(TermTreeDto tree){
         trees.remove(tree.getUuid());
-
      }
 
     @Override
@@ -547,15 +531,11 @@ public class TermTreeEditor<T extends DefinedTermBase>
             if (uuid.equals(cdmbaseUuid)){
                listToUpdate.add(uuidTermMap.get(uuid));
             }
-
         }
-
     }
 
     @Override
     public TermType getTermType() {
         return termType;
     }
-
-
-}
+}
\ No newline at end of file