cleanup

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbstractGeneralTermPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbstractGeneralTermPreference.java
index f982990dc31a9a5568940386bf4006a512e0d62d..e8abf70cf19911c8d00e0130f5ed7ea468aa8933 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbstractGeneralTermPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbstractGeneralTermPreference.java
@@ -48,9 +48,10 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 /**
  * @author k.luther
  * @since 05.06.2019
- *
  */
-abstract public class AbstractGeneralTermPreference<T extends AbstractTermDto> extends CdmPreferencePage implements ISelectionChangedListener, SelectionListener{
+public abstract class AbstractGeneralTermPreference<T extends AbstractTermDto>
+        extends CdmPreferencePage
+        implements ISelectionChangedListener, SelectionListener{
 
     protected CheckBoxTreeComposite treeComposite;
     protected List<TermVocabularyDto> vocabularies = new ArrayList<>();
@@ -67,9 +68,6 @@ abstract public class AbstractGeneralTermPreference<T extends AbstractTermDto> e
 
     }
 
-    /**
-     * @param title
-     */
     public AbstractGeneralTermPreference(String title) {
         super(title);
     }
@@ -101,9 +99,6 @@ abstract public class AbstractGeneralTermPreference<T extends AbstractTermDto> e
         return treeComposite;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected Control createContents(Composite parent) {
         Composite container = new Composite(parent, SWT.NULL);
@@ -161,7 +156,6 @@ abstract public class AbstractGeneralTermPreference<T extends AbstractTermDto> e
         treeComposite.getViewer().addSelectionChangedListener(this);
 
         return container;
-
     }
 
     public String getCheckedValuesFromPreferences(){
@@ -225,17 +219,11 @@ abstract public class AbstractGeneralTermPreference<T extends AbstractTermDto> e
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void selectionChanged(SelectionChangedEvent event) {
         this.setApply(true);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void widgetSelected(SelectionEvent e) {
         if (e.getSource().equals(useLocalOrAdmin)&& !isAdminPreference){
@@ -251,13 +239,9 @@ abstract public class AbstractGeneralTermPreference<T extends AbstractTermDto> e
         this.setApply(true);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void widgetDefaultSelected(SelectionEvent e) {
         // TODO Auto-generated method stub
-
     }
 
     @Override
@@ -346,5 +330,4 @@ abstract public class AbstractGeneralTermPreference<T extends AbstractTermDto> e
         PreferencesUtil.firePreferencesChanged(this.getClass());
         return true;
     }
-
-}
+}
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/GeneralVocabularyPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/GeneralVocabularyPreferencePage.java
index fe64e090e23ef125156be6fa4fe31d938eb264fe..ef42efac1b229a1e08225c5ddd96d32e93b17237 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/GeneralVocabularyPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/GeneralVocabularyPreferencePage.java
@@ -14,10 +14,8 @@ import java.util.List;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Combo;
@@ -40,13 +38,8 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @author k.luther
  * @since 13.09.2019
  */
-public class GeneralVocabularyPreferencePage extends AbstractGeneralTermPreference<TermVocabularyDto> implements ISelectionChangedListener, SelectionListener{
-
-
-    protected List<TermVocabularyDto> getVocabulariesFromPreference() {
-
-        return null;
-    }
+public class GeneralVocabularyPreferencePage
+        extends AbstractGeneralTermPreference<TermVocabularyDto> {
 
     @Override
     protected Control createContents(Composite parent) {
@@ -126,11 +119,10 @@ public class GeneralVocabularyPreferencePage extends AbstractGeneralTermPreferen
             treeComposite.setCheckedElements(termsFromStringValues.toArray());
 
         }else{
-            List<TermVocabularyDto> termsFromStringValues = getTermsFromStringValues(new ArrayList<String>());
+            List<TermVocabularyDto> termsFromStringValues = getTermsFromStringValues(new ArrayList<>());
             treeComposite.setCheckedElements(termsFromStringValues.toArray());
             treeComposite.getViewer().refresh();
             treeComposite.redraw();
-
         }
     }
 
@@ -138,7 +130,7 @@ public class GeneralVocabularyPreferencePage extends AbstractGeneralTermPreferen
     @Override
     protected List<TermVocabularyDto> getTermsFromStringValues(List<String> listValue) {
         List<TermVocabularyDto> vocList = new ArrayList<>();
-        List<UUID> uuids = new ArrayList();
+        List<UUID> uuids = new ArrayList<>();
         IVocabularyService vocService = CdmStore.getService(IVocabularyService.class);
         for (String s : listValue) {
             if (!StringUtils.isBlank(s)){
@@ -148,9 +140,8 @@ public class GeneralVocabularyPreferencePage extends AbstractGeneralTermPreferen
         }
         vocList = vocService.findVocabularyDtoByVocabularyUuids(uuids);
 
-
         if (listValue.isEmpty()){
-            vocList =vocService.findVocabularyDtoByTermType(type);
+            vocList = vocService.findVocabularyDtoByTermType(type);
         }
 
         return vocList;
@@ -210,7 +201,5 @@ public class GeneralVocabularyPreferencePage extends AbstractGeneralTermPreferen
 
        setApply(true);
        super.performDefaults();
-
     }
-
-}
+}
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CommonNameNamedAreaSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CommonNameNamedAreaSelectionDialog.java
index 1e30e473687171b52f945ea8bef92d7caab1b720..3c733f83a6ede412f4fa3a9e0ff427afe119b190 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CommonNameNamedAreaSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CommonNameNamedAreaSelectionDialog.java
@@ -94,7 +94,7 @@ public class CommonNameNamedAreaSelectionDialog extends NamedAreaSelectionDialog
      */
     public static NamedArea select(Shell shell,
             NamedArea namedArea, String preferenceId) {
-        CommonNameNamedAreaSelectionDialog dialog = new CommonNameNamedAreaSelectionDialog(shell, //conversation,
+        CommonNameNamedAreaSelectionDialog dialog = new CommonNameNamedAreaSelectionDialog(shell,
                 "Choose an area", false, namedArea, preferenceId);
         return getSelectionFromDialog(dialog);
     }