ref #7883 Revert visibility of class members + delete ambiguous method

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
index ded561e373c80341038c68ac4651c13da9d5ef65..d760f1a6863179f571466fd4308fa067e275dc9a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
@@ -35,12 +35,12 @@ import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 public class TermComboElement<T extends DefinedTermBase>
                extends AbstractComboElement<T> {
 
-       protected T emptyElement;
-       protected static String EMPTY_ELEMENT_LABEL = "";
+       private T emptyElement;
+       private static String EMPTY_ELEMENT_LABEL = "";
 
        private ArrayList<T> terms;
 
-       protected Comparator<T> termComparator;
+       private Comparator<T> termComparator;
 
        public Comparator<T> getTermComparator() {
                return termComparator;
@@ -48,7 +48,7 @@ public class TermComboElement<T extends DefinedTermBase>
 
        public void setTermComparator(Comparator<T> termComparator) {
                this.termComparator = termComparator;
-               List<T> termsWithoutNull = getTerms().subList(1, getTerms().size());
+               List<T> termsWithoutNull = terms.subList(1, terms.size());
 
                populateTerms(termsWithoutNull);
 
@@ -60,7 +60,7 @@ public class TermComboElement<T extends DefinedTermBase>
 
        private List<T> customPreferredTerms;
 
-       protected boolean useAbbrevLabel = false;
+       private boolean useAbbrevLabel = false;
        private boolean addEmptyElement;
 
        public TermComboElement(CdmFormFactory formFactory,
@@ -95,7 +95,7 @@ public class TermComboElement<T extends DefinedTermBase>
         this.termType = termType;
         this.termVocabulary = termVocabulary;
         this.termClass = termClass;
-        this.setAddEmptyElement(addEmptyElement);
+        this.addEmptyElement = addEmptyElement;
         this.useAbbrevLabel = useAbbrevLabel;
         this.termComparator = comparator;
         if (labelString != null) {
@@ -144,10 +144,10 @@ public class TermComboElement<T extends DefinedTermBase>
                        // set selection to the emptyElement
                        selectedIndex = 0;
                }else{
-                       selectedIndex = getTerms().indexOf(selection);
+                       selectedIndex = terms.indexOf(selection);
                        if (selectedIndex == -1) {
                                createTermNotInPreferredTerms(selection);
-                               selectedIndex = getTerms().indexOf(selection);
+                               selectedIndex = terms.indexOf(selection);
                        }
                }
                combo.select(selectedIndex);
@@ -167,15 +167,15 @@ public class TermComboElement<T extends DefinedTermBase>
 
                combo.removeAll();
 
-               setTerms(new ArrayList<T>());
+               terms = new ArrayList<T>();
 
                int i = 1;
                int index = 0;
 
-               if(isAddEmptyElement()){
+               if(addEmptyElement){
                    // Add an empty element for when nothing was selected yet
                    combo.add(EMPTY_ELEMENT_LABEL);
-                   getTerms().add(emptyElement);
+                   terms.add(emptyElement);
                }
 
                if (termComparator != null) {
@@ -199,7 +199,7 @@ public class TermComboElement<T extends DefinedTermBase>
                        }
 
                        combo.add(label);
-                       getTerms().add(term);
+                       terms.add(term);
 
                        i++;
                        if (selection != null) {
@@ -272,7 +272,7 @@ public class TermComboElement<T extends DefinedTermBase>
         *
         * @param term
         */
-       protected void createTermNotInPreferredTerms(T term) {
+       private void createTermNotInPreferredTerms(T term) {
                List<T> preferredTerms = getPreferredTerms();
 
                preferredTerms.add(term);
@@ -283,7 +283,7 @@ public class TermComboElement<T extends DefinedTermBase>
        /** {@inheritDoc} */
        @Override
     public void widgetSelected(SelectionEvent e) {
-               selection = getTerms().get(combo.getSelectionIndex());
+               selection = terms.get(combo.getSelectionIndex());
                firePropertyChangeEvent(new CdmPropertyChangeEvent(this, e));
        }
 
@@ -322,9 +322,9 @@ public class TermComboElement<T extends DefinedTermBase>
        }
 
        public void removeEmptyElement(){
-           if(isAddEmptyElement()){
-               if(getTerms().contains(emptyElement)){
-                   getTerms().remove(emptyElement);
+           if(addEmptyElement){
+               if(terms.contains(emptyElement)){
+                   terms.remove(emptyElement);
                }
                if(Arrays.asList(combo.getItems()).contains(EMPTY_ELEMENT_LABEL)){
                    combo.remove(EMPTY_ELEMENT_LABEL);
@@ -332,19 +332,4 @@ public class TermComboElement<T extends DefinedTermBase>
            }
        }
 
-    public ArrayList<T> getTerms() {
-        return terms;
-    }
-
-    public void setTerms(ArrayList<T> terms) {
-        this.terms = terms;
-    }
-
-    public boolean isAddEmptyElement() {
-        return addEmptyElement;
-    }
-
-    public void setAddEmptyElement(boolean addEmptyElement) {
-        this.addEmptyElement = addEmptyElement;
-    }
 }