cleanup

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
index 5ecec8c99b5cc2b37d6104fa59bf113f85398a14..5d41d7e708edc1dbfd8110acf847cf499fd70a66 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
@@ -13,7 +13,6 @@ import org.eclipse.osgi.util.NLS;
 /**
  * @author pplitzner
  * @date Apr 14, 2015
- *
  */
 public class Messages extends NLS {
 
@@ -31,18 +30,13 @@ public class Messages extends NLS {
 
     public static String LanguageMenuPreferences_warning;
 
-
     public static String LanguageRepresentationPreferencePage_global;
     public static String LanguageRepresentationPreferencePage_enable;
 
-
     public static String ListComponent_ADD_PROVIDER;
-
-
     public static String ListComponent_NO_PROVIDER_AVAILABLE;
-
-
     public static String ListComponent_REMOVE_PROVIDER;
+
     public static String DatabaseRepairPage_chooseParameter;
     public static String DatabaseRepairPage_updateTaxonNodes;
     public static String DatabaseRepairPage_toolTip_taxonNode;
@@ -71,13 +65,10 @@ public class Messages extends NLS {
     public static String LoginDialog_USER_NAME;
     public static String OpenCommonNameAreaWizardAdminHandler_COMMON_NAMES;
 
-
     public static String OpenDistributionEditorWizardHandlerAdminE4_DISTRIBUTION;
 
-
     public static String OpenDistributionEditorWizardHandlerE4_DISTRIBUTION;
 
-
     public static String OrderPreferences_Restore;
     public static String OrderPreferences_Sorting;
     public static String OrderPreferencePage_NewNavigatorWindowRequired;
@@ -96,13 +87,16 @@ public class Messages extends NLS {
     public static String CdmDataSourceViewPart_9;
     public static String CdmViewerContextMenu_OPEN;
     public static String CdmViewerContextMenu_OPEN_IN;
+
     public static String ChangeConnectionHandler_ALREADY_CONNECTING;
     public static String ChangeConnectionHandler_CURRENTLY_CONNECTING_ALREADY;
     public static String ChangeConnectionHandler_CREATE_DATAMODEL;
     public static String ChangeConnectionHandler_REALLY_CREATE_DATAMODEL;
     public static String ChangeConnectionHandler_DATASOURCE_NOT_AVAILABLE;
     public static String ChangeConnectionHandler_NOT_AVAILABLE_REASONS;
+
     public static String CheckBoxTreeComposite_SELECT_DIRECT_CHILDREN;
+
     public static String UpdateHandler_CHECK_UPDATE_JOB;
     public static String UpdateHandler_INSTALL_JOB;
     public static String UpdateHandler_NO_UPDATE_MESSAGE;
@@ -112,7 +106,6 @@ public class Messages extends NLS {
     public static String UpdateHandler_UPDATES_FOUND_MESSAGE;
     public static String UpdateHandler_UPDATES_FOUND_TITLE;
 
-
     public static String UriWithLabelElement_COULD_NOT_OPEN_BROWSER;
     public static String UriWithLabelElement_INVALID_URL;
     public static String UriWithLabelElement_OPEN_EXTERNAL_BROWSER;
@@ -137,7 +130,6 @@ public class Messages extends NLS {
        public static String CdmStoreConnector_UPDATE_DATASOUREC_OR_CHOOSE_NEW_DATASOURCE;
        public static String CdmStoreConnector_UPDATE_EDITOR_OR_CHOOSE_COMPATIBLE_DATASOURCE;
 
-
     public static String ConfiguratorComposite_CONFIGURE;
 
        public static String DefinedTermDropAdapterE4_MOVE_DESCRIPTIONS;
@@ -151,13 +143,9 @@ public class Messages extends NLS {
     public static String DefaultFeatureTreePreferenecs_0;
     public static String DefaultFeatureTreePreferenecs_1;
 
-
     public static String DefinedTermDropAdapterE4_TERM_TYPE_ERROR_MESSAGE;
-
-
     public static String DefinedTermDropAdapterE4_TERM_TYPE_ERROR_TITLE;
 
-
     public static String DefinedTermEditorE4_SAVE_MESSAGE;
     public static String DefinedTermEditorE4_SAVE_TITLE;
     public static String DefinedTermMenu_FEATURE_TREE;
@@ -172,8 +160,8 @@ public class Messages extends NLS {
     public static String EditPasswordElement_PLEASE_CREATE_OR_SAVE_USER;
     public static String EditPasswordElement_USERNAME_DOES_NOT_EXIST;
 
-
     public static String EmptySection_NO_VIEW_IMPLEMENTED;
+
     public static String PasswordWizard_COULD_NOT_CHANGE_PWD;
     public static String PasswordWizard_OLD_PWD_INCORRECT;
     public static String PasswordWizard_PROBLEM_WITH_CHANGING_PWD;
@@ -188,21 +176,16 @@ public class Messages extends NLS {
 
     public static String PresenceAbsenceMenuPreferences_choose;
 
-
     public static String PresenceAbsenceTermDetailElement_CHOOSE_COLOR;
     public static String PresenceAbsenceTermDetailElement_COLOR_NOT_SET;
     public static String PresenceAbsenceTermDetailElement_LABEL_COLOR;
     public static String PresenceAbsenceTermDetailElement_LABEL_IS_ABSENT;
 
-
     public static String PreservationMethodMenuPreferences_select;
 
     public static String RankMenuPreferences_display;
-
-
     public static String RankMenuPreferences_sort;
 
-
     public static String RemotingLoginDialog_CHOOSE_COMPATIBLE_CDM_SERVER;
     public static String RemotingLoginDialog_DEFAULT_LOGIN;
        public static String RemotingLoginDialog_LABEL_ADVANCED;
@@ -259,19 +242,15 @@ public class Messages extends NLS {
 
     public static String SupplementalDataPreferences_0;
 
-
     public static String SupplementalDataSourcePreferences_SHOW_ID;
-
-
     public static String SupplementalDataSourcePreferences_SHOW_NAMESPACE;
-
     public static String SupplementalDataViewPart_VIEWER_NAME;
-       public static String DeleteConfiguration_media_removeFromGallery;
+
+    public static String DeleteConfiguration_media_removeFromGallery;
        public static String DeleteConfiguration_media_deleteIfUsedInTaxonDescription;
        public static String DeleteConfiguration_media_deleteIfUsedSomeWhereElse;
        public static String DeleteConfiguration_media_delete;
 
-
     public static String DeleteResultMessagingUtils_ABORT;
     public static String DeleteResultMessagingUtils_SUCCES;
 
@@ -291,8 +270,6 @@ public class Messages extends NLS {
     public static String DeleteConfiguration_descriptiveDataSet_deleteAllAggregatedDesc;
     public static String DeleteConfiguration_descriptiveDataSet_deleteSelection;
 
-
-
     public static String DescriptionPreferences_1;
 
     public static String NewGrantedAuthority_AlreadyInDb;
@@ -755,7 +732,6 @@ public class Messages extends NLS {
     public static String SecundumPreference_description;
     public static String SecundumPreferenceSwap_description;
 
-
     public static String Tree;
 
     public static String Computed_factualData_handling_description;
@@ -767,13 +743,6 @@ public class Messages extends NLS {
        public static String StructuredDescriptionAggregationWizardPage_SELECT_LITERATURE_DESCRIPTION;
 
 
-
-
-
-
-
-
-
     static {
         // initialize resource bundle
         NLS.initializeMessages(BUNDLE_NAME, Messages.class);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/AggregationConfigurationWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/AggregationConfigurationWizardPage.java
index cf9eeccaa212478b96ba37d96241daed2b85f771..f9cf424f87a647aba04f99a9fa2af1fb3a5ab018 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/AggregationConfigurationWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/AggregationConfigurationWizardPage.java
@@ -59,7 +59,7 @@ public abstract class AggregationConfigurationWizardPage<T extends DescriptionAg
     protected Button checkIncludeDefaultDescriptions;
     protected Button checkIncludeLiteratureDescriptions;
     protected Button checkIncludeUnpublishedTaxa;
-    
+
     private Comparator<Rank> comparator = new Comparator<Rank>(){
         @Override
         public int compare(Rank o1, Rank o2) {
@@ -100,11 +100,8 @@ public abstract class AggregationConfigurationWizardPage<T extends DescriptionAg
             comboHigherRank.add(rank.getLabel());
             comboHigherRank.setData(rank.getLabel(), rank);
         }
-
-
     }
 
-
    protected void updateLowerRankCombo() {
        comboLowerRank.removeAll();
        TaxonName name = null;
@@ -133,7 +130,6 @@ public abstract class AggregationConfigurationWizardPage<T extends DescriptionAg
            comboLowerRank.add(rank.getLabel());
            comboLowerRank.setData(rank.getLabel(), rank);
        }
-
    }
 
    public Rank getHigherRank(){
@@ -203,5 +199,4 @@ public abstract class AggregationConfigurationWizardPage<T extends DescriptionAg
        }
        return result;
    }
-
-}
+}
\ No newline at end of file

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 0cc49f57e99aca6c2e08fa6a88c2628481bb24e5..e2bda33b9f58f4d61973583a30ccec47028bd452 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
@@ -59,13 +59,14 @@ public class StructuredDescriptionAggregationConfigurationWizardPage extends Agg
 
     @Override
     public void createControl(Composite parent) {
+
         final Composite control = new Composite(parent, SWT.NULL);
         GridLayout gridLayoutControl = new GridLayout();
         gridLayoutControl.numColumns = 2;
         control.setLayout(gridLayoutControl);
         control.setLayoutData(new GridData(SWT.FILL, SWT.LEFT, true, true));
 
-        //select between taxonnode filter for the whole descriptive dataset or the selected taxonnode/subtree
+        //taxon node filter
         GridData gridDataRadioComposite = new GridData();
         gridDataRadioComposite.horizontalSpan = 2;
         GridLayout gridLayoutRadioComposite = new GridLayout();
@@ -88,6 +89,7 @@ public class StructuredDescriptionAggregationConfigurationWizardPage extends Agg
            }
         });
 
+        //    ... from selected taxon
         checkUseSelectedTaxonNode= new Button(radioComposite,  SWT.RADIO);
         checkUseSelectedTaxonNode.setText(Messages.StructuredDescriptionAggregationWizardPage_SELECT_SELECTED_TAXA_ONLY);
         checkUseSelectedTaxonNode.addListener(SWT.Selection, new Listener() {
@@ -100,23 +102,14 @@ public class StructuredDescriptionAggregationConfigurationWizardPage extends Agg
                     setPageComplete(true);
                 }
             }
-
-
         });
 
-//        configurator.getTaxonNodeFilter().getSubtreeFilter().stream().forEach(p ->uuidList.add(p.getUuid()));
-//        List<String> propertyPaths = new ArrayList<>();
-//        propertyPaths.add("taxon.name");
-//        List<TaxonNode> nodeList = CdmApplicationState.getCurrentAppConfig().getTaxonNodeService().load(uuidList, propertyPaths);
-
+        //subtree selection
         Label selectSubtreeLabel = new Label(control, SWT.NULL);
         selectSubtreeLabel.setText(Messages.StructuredDescriptionAggregationWizardPage_SELECT_SUBTREE);
         selectSubtreeLabel.setToolTipText(Messages.StructuredDescriptionAggregationWizardPage_TOOLTIP_SELECT_SUBTREE);
         subTreeSelectionViewer = CheckboxTableViewer.newCheckList(control, SWT.BORDER | SWT.SINGLE);
-
         subTreeSelectionViewer.setContentProvider(new ArrayContentProvider());
-
-
         subTreeSelectionViewer.setLabelProvider(new LabelProvider(){
             @Override
             public String getText(Object element){
@@ -127,7 +120,6 @@ public class StructuredDescriptionAggregationConfigurationWizardPage extends Agg
                 }
                 return null;
             }
-
         });
 
         if (selectedNodes == null || selectedNodes.isEmpty()){
@@ -137,9 +129,7 @@ public class StructuredDescriptionAggregationConfigurationWizardPage extends Agg
             List<String> propertyPaths = new ArrayList<>();
             propertyPaths.add("taxon.name");
             nodeList = CdmApplicationState.getCurrentAppConfig().getTaxonNodeService().load(uuidList, propertyPaths);
-
             subTreeSelectionViewer.setInput(nodeList);
-
         }else{
             subTreeSelectionViewer.setInput(selectedNodes);
         }
@@ -183,21 +173,18 @@ public class StructuredDescriptionAggregationConfigurationWizardPage extends Agg
 
         Label scopeLabel = new Label(scopeComposite, SWT.NULL);
         scopeLabel.setText(Messages.StructuredDescriptionAggregationWizardPage_SELECT_DEFINE_SCOPE);
-       
-        
+
         checkIncludeUnpublishedTaxa = new Button(scopeComposite, SWT.CHECK);
         checkIncludeUnpublishedTaxa.setText(Messages.StructuredDescriptionAggregationWizardPage_SELECT_UNPUBLISHED_TAXA);
         checkIncludeUnpublishedTaxa.setSelection(true);
-        
-        
+
         checkIncludeDefaultDescriptions = new Button(scopeComposite, SWT.CHECK);
         checkIncludeDefaultDescriptions.setText(Messages.StructuredDescriptionAggregationWizardPage_SELECT_DEFAULT_DESCRIPTION);
-        checkIncludeDefaultDescriptions.setSelection(true);
-        
+
         checkIncludeLiteratureDescriptions = new Button(scopeComposite, SWT.CHECK);
         checkIncludeLiteratureDescriptions.setText(Messages.StructuredDescriptionAggregationWizardPage_SELECT_LITERATURE_DESCRIPTION);
-        checkIncludeLiteratureDescriptions.setSelection(true);
-        
+
+
         Label higherRankLabel = new Label(control, SWT.NULL);
         higherRankLabel.setText(Messages.DistributionAggregationWizardPage_HIGHEST_RANK);
 

diff --git a/eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java b/eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
index e6875ba4e45e3758187c5d8f99d618d3ae176120..712e478fbd7b76305210b8b31af7654f30ff4c82 100755 (executable)
--- a/eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
+++ b/eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
@@ -13,14 +13,11 @@ import org.eclipse.osgi.util.NLS;
 /**
  * @author pplitzner
  * @date Apr 14, 2015
- *
  */
 public class Messages extends NLS {
 
     private static final String BUNDLE_NAME = "src/main/java/eu.etaxonomy.taxeditor.l10n.messages"; //$NON-NLS-1$
 
-
-
     public static String LoginDialog_CANCEL_MESSAGE;
     public static String LoginDialog_LOGIN;
     public static String LoginDialog_PASSWORD;
@@ -28,8 +25,6 @@ public class Messages extends NLS {
     public static String LoginDialog_USER_LOGIN;
     public static String LoginDialog_USER_NAME;
 
-
-
     public static String CdmDataSourceViewPart_1;
     public static String CdmDataSourceViewPart_10;
     public static String CdmDataSourceViewPart_11;
@@ -50,9 +45,6 @@ public class Messages extends NLS {
     public static String ChangeConnectionHandler_DATASOURCE_NOT_AVAILABLE;
     public static String ChangeConnectionHandler_NOT_AVAILABLE_REASONS;
 
-
-
-
        public static String CdmStoreConnector_AUTHENTICATING_USER;
        public static String CdmStoreConnector_CHECK_IF_EDITOR_IS_COMPATIBLE;
        public static String CdmStoreConnector_CHECK_IF_NON_EMPTY;
@@ -120,17 +112,6 @@ public class Messages extends NLS {
        public static String RemotingLoginDialog_SCHEMA_MISSING;
        public static String RemotingLoginDialog_NO_SCHEMA;
 
-
-
-
-
-
-
-
-
-
-
-
     static {
         // initialize resource bundle
         NLS.initializeMessages(BUNDLE_NAME, Messages.class);
@@ -138,4 +119,4 @@ public class Messages extends NLS {
 
     private Messages() {
     }
-}
+}
\ No newline at end of file