From: Patrick Plitzner
Date: Wed, 18 Jan 2017 08:28:54 +0000 (+0100)
Subject: ref #6333 Remove framework for exchanging an element in the details view
X-Git-Tag: 4.5.0^2~7
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/d89cdff166afd0e8f9410b93c6244a799c69cec0
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 32d06710e..2dea789ec 100644
--- 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 153a706aa..a6bbaca09 100644
--- 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 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 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 fd51f9393..c6fb2d920 100644
--- 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 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 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 cc70dfb0f..187f41a94 100644
--- 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 7536fec98..f75b4ef74 100644
--- 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 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 f49f23ce0..c5a91413a 100644
--- 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 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 62c0ebf69..492be0f82 100644
--- 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);
}