cleanup

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4Composite.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4Composite.java
index 29868bade4e637111de4d06330a4da6f02d59dde..21546d5cb087934ca6ef2e71b2a04f0bf680add0 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4Composite.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4Composite.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.bulkeditor.e4;
 
 import java.io.File;
@@ -88,10 +87,8 @@ import eu.etaxonomy.taxeditor.model.ImageResources;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
- *
  * @author pplitzner
  * @since Sep 8, 2017
- *
  */
 public class BulkEditorE4Composite extends Composite {
 
@@ -127,7 +124,7 @@ public class BulkEditorE4Composite extends Composite {
     @Inject
     private IEventBroker eventBroker;
 
-
+    
     public BulkEditorE4Composite(BulkEditorE4 bulkEditor, Composite parent, int style) {
         super(parent, style);
         parent.setLayout(new GridLayout());
@@ -146,7 +143,6 @@ public class BulkEditorE4Composite extends Composite {
         bottomComposite.setLayout(new GridLayout());
        }
 
-       @SuppressWarnings("unused")
     public void init(AbstractBulkEditorInput<?> input){
 
         input.getPropertyKeys().forEach(key->columnList.add(key));
@@ -174,7 +170,6 @@ public class BulkEditorE4Composite extends Composite {
         selectionListener.setFullySelectedRowsOnly(false);
 
         bottomComposite.layout();
-
        }
 
        private void createTable(){
@@ -300,9 +295,9 @@ public class BulkEditorE4Composite extends Composite {
                     UiBindingRegistry uiBindingRegistry) {
                 // add e4 menu to NatTable
                 new PopupMenuBuilder(natTable, e4Menu)
-                .withHideColumnMenuItem()
-                .withShowAllColumnsMenuItem()
-                .build();
+                       .withHideColumnMenuItem()
+                       .withShowAllColumnsMenuItem()
+                       .build();
 
                 // register the UI binding for header, corner and body region
                 uiBindingRegistry.registerMouseDownBinding(
@@ -314,7 +309,6 @@ public class BulkEditorE4Composite extends Composite {
             }
         });
 
-
         //enable sorting
         natTable.addConfiguration(new SingleClickSortConfiguration());
 
@@ -369,8 +363,6 @@ public class BulkEditorE4Composite extends Composite {
 
        }
 
-       /** {@inheritDoc}
-        * @param selection */
     public void performSearch(BulkEditorQuery query, IStructuredSelection selection) {
         if (query != null) {
             if(StoreUtil.promptCheckIsDirty(bulkEditor)){
@@ -451,5 +443,4 @@ public class BulkEditorE4Composite extends Composite {
     File getStatePropertiesFile() {
         return bulkEditorSearch.getStatePropertiesFile();
     }
-
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/FactualDataPartE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/FactualDataPartE4.java
index 642968ae3d5f3231e90e542f5f78f503fe1212ee..0407f5bb288c820749d03204afaf7bb8b3014332 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/FactualDataPartE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/FactualDataPartE4.java
@@ -127,8 +127,8 @@ public class FactualDataPartE4 extends AbstractCdmEditorPartE4
         }
 
         Object partObject = createPartObject(activePart);
-
-
+        
+        
 
         if ((partObject instanceof DetailsPartE4 && !(selection instanceof TaxonName))|| partObject instanceof SupplementalDataPartE4
                 || partObject instanceof MediaViewPartE4 || partObject instanceof ConceptViewPartE4 || ((partObject instanceof AbstractCdmEditorPartE4) &&(((AbstractCdmEditorPartE4)partObject).getViewer().getInput() instanceof DescriptionElementBase))) {
@@ -206,7 +206,7 @@ public class FactualDataPartE4 extends AbstractCdmEditorPartE4
         ((TreeViewer) viewer).setExpandedElements(expandedObjects);
         if(object instanceof DescriptionElementBase){
             DescriptionElementBase descriptionElement = (DescriptionElementBase) object;
-            DescriptionBase description = descriptionElement.getInDescription();
+            DescriptionBase<?> description = descriptionElement.getInDescription();
             FeatureNodeContainerTree containerTree = featureNodeContainerCache.get(description);
             FeatureNodeContainer featureNodeContainer = containerTree.getFeatureNodeContainerForDescriptionElement(descriptionElement);
             if (featureNodeContainer == null){