ref #6333 Remove framework for exchanging an element in the details view

 - This is against the concept of the DetailsView just showing an
element which you can edit. Changing the element requires the
DetailsView to know where the element comes from

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
index 32d06710ef86f5409207e8fa7f1d367ba15b72ed..2dea789ecbacdb0f4e981c343a03187ebdd4b040 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
@@ -2584,7 +2584,7 @@ public class CdmFormFactory extends FormToolkit {
         } else if (entity instanceof TaxonNodeAgentRelation) {
             element = new TaxonNodeAgentRelationCollectionElement(this, parentElement, (TaxonNodeAgentRelation) entity, removeListener, backgroundColor, style);
         }else if (entity instanceof Media) {
-            element = new MediaMetaElement(this, parentElement, (Media) entity, removeListener, true, style);
+            element = new MediaMetaElement(this, parentElement, (Media) entity, removeListener, style);
         } else if (entity instanceof MediaRepresentation) {
             element = new MediaRepresentationElement(this, parentElement, (MediaRepresentation) entity, removeListener,
                     style);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionElement.java
index 153a706aa018cb66d04bd70e8d6242a3bda2b78e..a6bbaca09fe4e482f494d7579fffc87ee93b9470 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionElement.java
@@ -16,8 +16,6 @@ import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
 import org.eclipse.ui.forms.widgets.TableWrapLayout;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
@@ -59,14 +57,9 @@ public abstract class AbstractEntityCollectionElement<ENTITY> extends
 
        private Color backgroundColor;
 
-       public AbstractEntityCollectionElement(CdmFormFactory formFactory,
-               AbstractFormSection section, ENTITY entity,
-               SelectionListener removeListener, Color backgroundColor, int style) {
-           this(formFactory, section, entity, removeListener, false, backgroundColor, style);
-       }
        public AbstractEntityCollectionElement(CdmFormFactory formFactory,
                        AbstractFormSection section, ENTITY entity, SelectionListener removeListener,
-                       boolean isChoosableEntity, Color backgroundColor, int style) {
+                       Color backgroundColor, int style) {
                super(formFactory, (ICdmFormElement) section);
                this.entity = entity;
 
@@ -97,29 +90,6 @@ public abstract class AbstractEntityCollectionElement<ENTITY> extends
                container.setLayout(containerLayout);
                container.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
 
-               if(isChoosableEntity){
-                   btnChooseEntity = formFactory.createButton(box, null, SWT.PUSH);
-                   addControl(btnChooseEntity);
-
-                   btnChooseEntity.setLayoutData(LayoutConstants.RIGHT());
-                   btnChooseEntity.setImage(ImageResources.getImage(ImageResources.BROWSE_ICON));
-                   btnChooseEntity.setToolTipText("Browse");
-                   btnChooseEntity.addListener(SWT.Selection, new Listener() {
-
-                       @Override
-                       public void handleEvent(Event event) {
-                           ENTITY entity = selectFromDialog();
-                           if(entity!=null){
-                               if(getParentElement() instanceof AbstractEntityCollectionSection){
-                                   ((AbstractEntityCollectionSection)getParentElement()).removeElement(getEntity());
-                                   ((AbstractEntityCollectionSection)getParentElement()).addElement(entity);
-                               }
-                               firePropertyChangeEvent(this);
-                           }
-                       }
-                   });
-               }
-
                if (removeListener != null) {
                        btnRemove = formFactory.createButton(box, null, SWT.PUSH);
                        addControl(btnRemove);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java
index fd51f9393bdbc8f9bdec2956aaf215bc8229fbe1..c6fb2d920c173f1314a5ac27ff407829647c387f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java
@@ -46,14 +46,14 @@ public class MediaMetaElement extends AbstractEntityCollectionElement<Media> imp
 
     public MediaMetaElement(CdmFormFactory cdmFormFactory,
             AbstractFormSection<?> formElement, Media element,
-            SelectionListener removeListener, boolean isChoosableEntity, int style) {
-        super(cdmFormFactory, formElement, element, removeListener, isChoosableEntity, null, style);
+            SelectionListener removeListener, int style) {
+        super(cdmFormFactory, formElement, element, removeListener, null, style);
         //make element selectable
         if(cdmFormFactory.getSelectionProvider() != null){
             selectionArbitrator = cdmFormFactory.createSelectionArbitrator(this);
         }
-       
-       
+
+
     }
 
     /** {@inheritDoc} */
@@ -102,12 +102,12 @@ public class MediaMetaElement extends AbstractEntityCollectionElement<Media> imp
         }
 
         text_title.setLanguageString(title);
-        
+
     }
 
     @Override
     protected Media selectFromDialog() {
-       
+
        setEntity(MediaSelectionDialog.select(AbstractUtility.getShell(), null, null));
         return entity;
     }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/MeasurementUnitCollectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/MeasurementUnitCollectionElement.java
index cc70dfb0f0b72289e243e6e4dd5684472419bbcb..187f41a94e3a5d5857cc6d626f02b958b13d0b6b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/MeasurementUnitCollectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/MeasurementUnitCollectionElement.java
@@ -41,7 +41,7 @@ public class MeasurementUnitCollectionElement extends AbstractEntityCollectionEl
      */
     public MeasurementUnitCollectionElement(CdmFormFactory formFactory, AbstractFormSection section, MeasurementUnit entity,
             SelectionListener removeListener, Color backgroundColor, int style) {
-        super(formFactory, section, entity, removeListener, false, backgroundColor, style);
+        super(formFactory, section, entity, removeListener, backgroundColor, style);
 
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/RecommendedModifierVocabulariesElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/RecommendedModifierVocabulariesElement.java
index 7536fec98c86864ad298ac123a63bf8058521731..f75b4ef74f51b99f1d9538b7a52d31787d5b5ff2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/RecommendedModifierVocabulariesElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/RecommendedModifierVocabulariesElement.java
@@ -42,7 +42,7 @@ public class RecommendedModifierVocabulariesElement extends AbstractEntityCollec
      */
     public RecommendedModifierVocabulariesElement(CdmFormFactory formFactory, AbstractFormSection section, TermVocabulary<DefinedTerm> entity,
             SelectionListener removeListener, Color backgroundColor, int style) {
-        super(formFactory, section, entity, removeListener, false, backgroundColor, style);
+        super(formFactory, section, entity, removeListener, backgroundColor, style);
 
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyCollectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyCollectionElement.java
index f49f23ce023b0863c3e6eb7c304449e9e55175ff..c5a91413aadbbc6096b35764c1fa5647186f722a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyCollectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyCollectionElement.java
@@ -42,7 +42,7 @@ public class StateVocabularyCollectionElement extends AbstractEntityCollectionEl
      */
     public StateVocabularyCollectionElement(CdmFormFactory formFactory, AbstractFormSection section, TermVocabulary<State> entity,
             SelectionListener removeListener, Color backgroundColor, int style) {
-        super(formFactory, section, entity, removeListener, false, backgroundColor, style);
+        super(formFactory, section, entity, removeListener, backgroundColor, style);
 
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StatisticalMeasureCollectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StatisticalMeasureCollectionElement.java
index 62c0ebf6983869757195e6db2e288f9b4ddd4cd1..492be0f82d7ada2d5fbed34650f812e6b619000f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StatisticalMeasureCollectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StatisticalMeasureCollectionElement.java
@@ -41,7 +41,7 @@ public class StatisticalMeasureCollectionElement extends AbstractEntityCollectio
      */
     public StatisticalMeasureCollectionElement(CdmFormFactory formFactory, AbstractFormSection section, StatisticalMeasure entity,
             SelectionListener removeListener, Color backgroundColor, int style) {
-        super(formFactory, section, entity, removeListener, false, backgroundColor, style);
+        super(formFactory, section, entity, removeListener, backgroundColor, style);
 
     }