From 46c38373850b9a239c0d7cb5c496a332b42b9173 Mon Sep 17 00:00:00 2001 From: Patric Plitzner
- * createEntityCollectionElement - *
- * - * @param removeListener - * a {@link org.eclipse.swt.events.SelectionListener} object. - * @param style - * a int. - * @param parentElement - * a - * {@link eu.etaxonomy.taxeditor.ui.element.AbstractFormSection} - * object. - * @param versionableEntity - * a {@link eu.etaxonomy.cdm.model.common.IVersionableEntity} - * object. - * @param backgroundColor - * a {@link org.eclipse.swt.graphics.Color} object. - * @return a - * {@link eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement} - * object. - */ public AbstractEntityCollectionElement createEntityCollectionElement(AbstractFormSection parentElement, Object versionableEntity, SelectionListener removeListener, Color backgroundColor, int style) { AbstractEntityCollectionElement element = null; @@ -2434,7 +2412,7 @@ public class CdmFormFactory extends FormToolkit { } else if (entity instanceof Marker) { element = new MarkerElement(this, parentElement, (Marker) entity, removeListener, style); } else if (entity instanceof Media) { - element = new MediaMetaElement(this, parentElement, (Media) entity, removeListener, style); + element = new MediaMetaElement(this, parentElement, (Media) entity, removeListener, true, style); } else if (entity instanceof MediaRepresentation) { element = new MediaRepresentationElement(this, parentElement, (MediaRepresentation) entity, removeListener, style); @@ -2454,28 +2432,28 @@ public class CdmFormFactory extends FormToolkit { } else if (entity instanceof IdentifiableSource) { element = new IdentifiableSourceElement(this, parentElement, (IdentifiableSource) entity, removeListener, style); - } else if (entity instanceof DefinedTerm) { - switch(((DefinedTerm)entity).getTermType()) { - case Scope: - element = new ScopeElement(this, - parentElement, - (DefinedTerm) entity, - removeListener, - style); - break; - case Modifier: - element = new ModifierElement(this, - parentElement, - (DefinedTerm) entity, - removeListener, - style); - break; - default: - //FIXME : Actually we should through an exception here - element = null; - break; - - } + } else if (entity instanceof DefinedTerm) { + switch(((DefinedTerm)entity).getTermType()) { + case Scope: + element = new ScopeElement(this, + parentElement, + (DefinedTerm) entity, + removeListener, + style); + break; + case Modifier: + element = new ModifierElement(this, + parentElement, + (DefinedTerm) entity, + removeListener, + style); + break; + default: + //FIXME : Actually we should through an exception here + element = null; + break; + + } } else if (entity instanceof Reference) { if(parentElement instanceof SequenceReferenceCollectionDetailSection){ element = new SequenceReferenceCollectionDetailElement(this, parentElement, (Reference) entity, removeListener, style); @@ -2501,23 +2479,23 @@ public class CdmFormFactory extends FormToolkit { element = new StatisticalMeasurementValueElement(this, parentElement, (StatisticalMeasurementValue) entity, removeListener, style); } else if (entity instanceof DerivedUnit) { - switch(((DerivedUnit)entity).getRecordBasis()) { - case LivingSpecimen: - case PreservedSpecimen: - case OtherSpecimen: - element = new SpecimenCollectionDetailElement(this, - parentElement, - (DerivedUnit) entity, - removeListener, - style); - break; - default: - element = new DerivedUnitElement(this, - parentElement, - (DerivedUnit) entity, - removeListener, - style); - } + switch(((DerivedUnit)entity).getRecordBasis()) { + case LivingSpecimen: + case PreservedSpecimen: + case OtherSpecimen: + element = new SpecimenCollectionDetailElement(this, + parentElement, + (DerivedUnit) entity, + removeListener, + style); + break; + default: + element = new DerivedUnitElement(this, + parentElement, + (DerivedUnit) entity, + removeListener, + style); + } } else if (entity instanceof NamedArea) { element = new NamedAreaDetailElement(this, parentElement, (NamedArea) 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 e2fcbef06..1060f986f 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 @@ -17,7 +17,9 @@ 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.Layout; +import org.eclipse.swt.widgets.Listener; import org.eclipse.ui.forms.widgets.TableWrapLayout; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; @@ -52,7 +54,8 @@ public abstract class AbstractEntityCollectionElement
* createControls
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 a61bfdc81..689ba6146 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
@@ -9,7 +9,9 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.agent.AgentBase;
import eu.etaxonomy.cdm.model.common.LanguageString;
import eu.etaxonomy.cdm.model.media.Media;
+import eu.etaxonomy.taxeditor.model.AbstractUtility;
import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.dialog.selection.MediaSelectionDialog;
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@ -54,8 +56,8 @@ public class MediaMetaElement extends AbstractEntityCollectionElement