- added combo controller to combo field in DerivateSearchView

diff --git a/.gitattributes b/.gitattributes
index 55a8b43af708dd22db8713bbc9364fc9d5afcb6d..e9d2265cc23aafd6488cb4ae22a38add10fd4496 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1333,6 +1333,8 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/group/grant
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/group/grantedauthority/CdmAuthorityCompositeViewer.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/group/grantedauthority/CdmAuthorityRow.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/group/grantedauthority/CdmAuthorityTableHeader.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermCombo.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermComboController.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/IOpenUrlEnabled.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlContentProvider.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlLabelProvider.java -text
@@ -1601,8 +1603,6 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateS
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchComposite.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/EnumTermCombo.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/EnumTermComboController.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewPart.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java -text

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/EnumTermCombo.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermCombo.java
similarity index 78%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/EnumTermCombo.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermCombo.java
index 2984cc90360c0d5d7d2b5d0309b92723e7d7c689..ffc9d82bc32f0082645d6a2d820d53cd19a22e5d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/EnumTermCombo.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermCombo.java
@@ -7,7 +7,7 @@
 * 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.view.derivateSearch;
+package eu.etaxonomy.taxeditor.ui.mvc.combo;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
@@ -15,7 +15,6 @@ import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.TableWrapData;
 import org.eclipse.ui.forms.widgets.TableWrapLayout;
@@ -29,11 +28,11 @@ import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
  * @date 29.01.2014
  *
  */
-public class EnumTermCombo extends Composite {
+public class EnumTermCombo extends Combo{
 
     private final FormToolkit toolkit = new FormToolkit(Display.getCurrent());
     private final Combo combo;
-    private final Label label;
+//    private final Label label;
 
     /**
      * Create the composite.
@@ -58,10 +57,10 @@ public class EnumTermCombo extends Composite {
             setLayout(tableWrapLayout);
         }
 
-        label = toolkit.createLabel(this, "New Label", SWT.NONE);
-        TableWrapData twd_label = new TableWrapData(TableWrapData.RIGHT, TableWrapData.TOP, 1, 1);
-        twd_label.align = TableWrapData.LEFT;
-        label.setLayoutData(twd_label);
+//        label = toolkit.createLabel(this, "New Label", SWT.NONE);
+//        TableWrapData twd_label = new TableWrapData(TableWrapData.RIGHT, TableWrapData.TOP, 1, 1);
+//        twd_label.align = TableWrapData.LEFT;
+//        label.setLayoutData(twd_label);
 
         combo = new Combo(this, SWT.READ_ONLY);
         combo.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1));
@@ -72,19 +71,19 @@ public class EnumTermCombo extends Composite {
     public Combo getCombo() {
         return combo;
     }
-    public Label getLabel() {
-        return label;
-    }
+//    public Label getLabel() {
+//        return label;
+//    }
 
     public <T extends IEnumTerm<T>> EnumTermComboController<T> initController(Class<T> enumType, CdmFormFactory formFactory, ICdmFormElement parentElement){
         return new EnumTermComboController<T>(this, formFactory, parentElement, enumType, 0);
-//        factory.createController(this);
+//        CdmCompositeControllerFactory.createController(this, entity, formFactory, parentElement);
 //        Control[] children = this.getChildren();
 //        for (int i = 0; i < children.length; i++) {
 //            if(children[i] instanceof CdmComposite){
-//                children[i].initController();
+//                return ((CdmComposite)children[i]).initController(entity, formFactory, parentElement);
 //            }
 //        }
-
+//        return null;
     }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/EnumTermComboController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermComboController.java
similarity index 92%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/EnumTermComboController.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermComboController.java
index 0a52af2c6aedc360714c5ddcefc9c6ce718e84f0..6ecef6ffa9c4c2edb80acce5a5f40f03372b730f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/EnumTermComboController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermComboController.java
@@ -7,7 +7,7 @@
  * 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.view.derivateSearch;
+package eu.etaxonomy.taxeditor.ui.mvc.combo;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -20,7 +20,7 @@ import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Composite;
 
 import eu.etaxonomy.cdm.model.common.IEnumTerm;
 import eu.etaxonomy.cdm.model.common.OriginalSourceType;
@@ -127,7 +127,6 @@ IEnableableFormElement, ISelectable {
 
     protected List<T> elementTypeList = new ArrayList<T>();
 
-    private final Label label;
     protected Combo combo;
 
     private final Class<T> enumType;
@@ -148,19 +147,13 @@ IEnableableFormElement, ISelectable {
      * @param <T>
      *            a T object.
      */
-    public EnumTermComboController(EnumTermCombo enumTermCombo, CdmFormFactory formFactory,
+    public EnumTermComboController(Combo combo, CdmFormFactory formFactory,
             ICdmFormElement parentElement, Class<T> enumType, int style) {
-        super(formFactory, parentElement);
+        super(formFactory, (Composite)null);
         this.enumType = enumType;
-        label = enumTermCombo.getLabel();
-        label.setParent(getLayoutComposite());
-        label.setText(getDefaultLabelString());
-//        label = formFactory.createLabel(getLayoutComposite(), getDefaultLabelString());
-        addControl(label);
-
         // create combo
-        combo = enumTermCombo.getCombo();
-        combo.setParent(getLayoutComposite());
+        this.combo = combo;
+//        combo.setParent(getLayoutComposite());
 //        combo = new Combo(getLayoutComposite(), SWT.BORDER | SWT.READ_ONLY);
         addControl(combo);
 //        combo.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
@@ -170,8 +163,8 @@ IEnableableFormElement, ISelectable {
 
         combo.addSelectionListener(this);
 
-        formFactory.adapt(this);
-        parentElement.addElement(this);
+//        formFactory.adapt(this);
+//        parentElement.addElement(this);
     }
 
     private String getDefaultLabelString() {
@@ -298,7 +291,7 @@ IEnableableFormElement, ISelectable {
     /** {@inheritDoc} */
     @Override
     public void setBackground(Color color) {
-        label.setBackground(color);
+//        label.setBackground(color);
     }
 
     /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java
index 3450dd889c5cfbf4538885b2b98853d3e1b475cf..56017a0227f5bf81f6a5ffd07a03822f60f68933 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java
@@ -70,7 +70,8 @@ public abstract class AbstractCdmDetailElement<T> extends AbstractCdmFormElement
         * @param entity
         *            a T object.
         */
-       public void setEntity(T entity) {
+       @Override
+    public void setEntity(T entity) {
                this.entity = entity;
                updateContent();
        }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java
index a928adeb0b9ef8ee5664152b8366e669fe93919c..5ce36413776468b1e9e6d07a527a2804e9b7e8c0 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java
@@ -34,6 +34,7 @@ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.mvc.combo.EnumTermComboController;
 
 /**
  * Controller class for the {@link DerivateSearchComposite}.<br>
@@ -45,6 +46,7 @@ public class DerivateSearchCompositeController {
 
     private final DerivateSearchComposite derivateSearchComposite;
     private IIdentifiableEntityServiceConfigurator<SpecimenOrObservationBase<DerivedUnitFacadeCacheStrategy>> configurator;
+    private EnumTermComboController<SpecimenOrObservationType> enumTermComboController;
 
     /**
      * @param parent
@@ -63,7 +65,8 @@ public class DerivateSearchCompositeController {
             count++;
         }
 
-        derivateSearchComposite.getComboDerivateType().setItems(comboItems);
+//        derivateSearchComposite.getComboDerivateType().setItems(comboItems);
+        enumTermComboController = new EnumTermComboController<SpecimenOrObservationType>(derivateSearchComposite.getComboDerivateType(), null, null, SpecimenOrObservationType.class, 0);
 
         derivateSearchComposite.getSearchField().addKeyListener(new KeyAdapter() {
             /*