cleanup

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveLabelProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveLabelProvider.java
index ab46f299b44bcde15fc2b2a56c44355d3c0c1449..d19c41fe0d19da048c34ecf1ec0e945bd8b30759 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveLabelProvider.java
@@ -73,9 +73,9 @@ public class DescriptiveLabelProvider extends ColumnLabelProvider implements ISt
 
        @Override
     public Color getForeground(Object element) {
-           DescriptionBase desc = null;
+           DescriptionBase<?> desc = null;
            if (element instanceof DescriptionBase){
-               desc = (DescriptionBase)element;
+               desc = (DescriptionBase<?>)element;
            }else if (element instanceof DescriptionElementBase){
                desc = ((DescriptionElementBase)element).getInDescription();
            }else if (element instanceof FeatureNodeContainer){
@@ -86,5 +86,4 @@ public class DescriptiveLabelProvider extends ColumnLabelProvider implements ISt
            }
            return null;
     }
-
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/ToggleShowOnlyIndividualAssociationsHandlerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/ToggleShowOnlyIndividualAssociationsHandlerE4.java
index 641a1feaadde5f8ffeac556718ed171d3a6da694..4a20ab29602e33fbeab5e94ecc067dd13d0b1661 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/ToggleShowOnlyIndividualAssociationsHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/ToggleShowOnlyIndividualAssociationsHandlerE4.java
@@ -17,10 +17,8 @@ import org.eclipse.e4.ui.services.IServiceConstants;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.e4.FactualDataPartE4;
 
 /**
- *
  * @author pplitzner
  * @date 15.08.2017
- *
  */
 public class ToggleShowOnlyIndividualAssociationsHandlerE4  {
 
@@ -29,5 +27,4 @@ public class ToggleShowOnlyIndividualAssociationsHandlerE4  {
         FactualDataPartE4 factualDataPart = (FactualDataPartE4) activePart.getObject();
         factualDataPart.toggleShowOnlyIndividualAssociations();
     }
-
-}
+}
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateTaxonDescriptionOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateTaxonDescriptionOperation.java
index b869d3470897e82072413d9c2b966f85fa50f3d8..63142dc47de4cf98036957b5fb24a82bbb556f85 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateTaxonDescriptionOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateTaxonDescriptionOperation.java
@@ -19,7 +19,6 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 /**
  * @author pplitzner
  * @date 04.12.2013
- *
  */
 public class CreateTaxonDescriptionOperation extends AbstractDescriptionPostOperation<Taxon, TaxonDescription> {
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/DistributionAggregationWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/DistributionAggregationWizardPage.java
index 65257c2574847d01c2c7702861e724b1610988f3..4978777ad806d845fbda3e0cbeb7ec354a572aee 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/DistributionAggregationWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/DistributionAggregationWizardPage.java
@@ -71,7 +71,7 @@ public class DistributionAggregationWizardPage
     private List<Classification> classifications;
     private Classification selectedClassification;
 
-    private Button checkExportUnpublished;
+    private Button checkIncludeUnpublished;
 
     private Object[] checkedElements;
 
@@ -367,8 +367,8 @@ public class DistributionAggregationWizardPage
         comboStatusOrder.addSelectionListener(this);
         comboStatusOrder.select(0);
 
-        checkExportUnpublished = new Button(composite,  SWT.CHECK);
-        checkExportUnpublished.setText(Messages.DistributionAggregationWizardPage_EXPORT_UNPUBLISHED);
+        checkIncludeUnpublished = new Button(composite,  SWT.CHECK);
+        checkIncludeUnpublished.setText(Messages.DistributionAggregationWizardPage_EXPORT_UNPUBLISHED);
 
         GridLayoutFactory.fillDefaults();
 
@@ -429,7 +429,7 @@ public class DistributionAggregationWizardPage
    }
 
    public boolean useUnpublishedData(){
-       return checkExportUnpublished.getSelection();
+       return checkIncludeUnpublished.getSelection();
    }
 
     public Classification getSelectedClassification() {

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredDescriptionAggregationConfigurationWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredDescriptionAggregationConfigurationWizardPage.java
index a5c139f79b198a4fa9e47f2a882d53e342607686..9c3417ad3cf51d3b058fc3d58720cf1e3b1f548d 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredDescriptionAggregationConfigurationWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredDescriptionAggregationConfigurationWizardPage.java
@@ -28,7 +28,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.forms.widgets.TableWrapData;
 
 import eu.etaxonomy.cdm.api.application.CdmApplicationState;
 import eu.etaxonomy.cdm.api.service.description.AggregationMode;
@@ -55,7 +54,7 @@ public class StructuredDescriptionAggregationConfigurationWizardPage
 
     protected Button checkIncludeDefaultDescriptions;
     protected Button checkIncludeLiteratureDescriptions;
-    
+
     private Label selectSubtreeLabel;
 
     protected StructuredDescriptionAggregationConfigurationWizardPage(StructuredDescriptionAggregationConfiguration configurator, List<TaxonNodeDto> nodes) {
@@ -137,7 +136,7 @@ public class StructuredDescriptionAggregationConfigurationWizardPage
         selectSubtreeLabel = new Label(control, SWT.NULL);
         selectSubtreeLabel.setText(Messages.StructuredDescriptionAggregationWizardPage_SELECT_SUBTREE);
         selectSubtreeLabel.setToolTipText(Messages.StructuredDescriptionAggregationWizardPage_TOOLTIP_SELECT_SUBTREE);
-        
+
         GridData gridData = new GridData();
         gridData.horizontalIndent = 25;
         gridData.verticalAlignment = SWT.TOP;
@@ -186,14 +185,14 @@ public class StructuredDescriptionAggregationConfigurationWizardPage
         //scope (published taxa, literature + default descriptions)
         Label scopeLabel = new Label(control, SWT.NULL);
         scopeLabel.setText(Messages.StructuredDescriptionAggregationWizardPage_SELECT_DEFINE_SCOPE);
-        
+
         Composite scopeComposite = new Composite(control, SWT.NULL);
         GridLayout gridDataScopeComposite = new GridLayout();
         gridDataScopeComposite.numColumns = 1;
         scopeComposite.setLayout(gridDataScopeComposite);
-        
+
 //        GridLayoutFactory.fillDefaults();
-        
+
         checkIncludeUnpublishedTaxa = new Button(scopeComposite, SWT.CHECK);
         checkIncludeUnpublishedTaxa.setText(Messages.StructuredDescriptionAggregationWizardPage_SELECT_UNPUBLISHED_TAXA);
         checkIncludeUnpublishedTaxa.setSelection(configurator.getTaxonNodeFilter().isIncludeUnpublished());
@@ -201,7 +200,7 @@ public class StructuredDescriptionAggregationConfigurationWizardPage
         checkIncludeDefaultDescriptions = new Button(scopeComposite, SWT.CHECK);
         checkIncludeDefaultDescriptions.setText(Messages.StructuredDescriptionAggregationWizardPage_SELECT_DEFAULT_DESCRIPTION);
         checkIncludeDefaultDescriptions.setEnabled(false);
-        
+
 
         checkIncludeLiteratureDescriptions = new Button(scopeComposite, SWT.CHECK);
         checkIncludeLiteratureDescriptions.setText(Messages.StructuredDescriptionAggregationWizardPage_SELECT_LITERATURE_DESCRIPTION);