From a5d6e4c07be6b2e6ed841bff9376b82d362d3c73 Mon Sep 17 00:00:00 2001 From: "n.hoffmann" Date: Thu, 9 Jun 2011 09:23:35 +0000 Subject: [PATCH] Renaming MediaMetaData to MediaInfo --- .../META-INF/MANIFEST.MF | 2 +- .../name/container/AcceptedNameContainer.java | 2 -- .../ui/forms/AbstractCdmFormElement.java | 16 ++++++++++++---- .../taxeditor/ui/forms/AbstractFormSection.java | 6 ++++-- .../taxeditor/ui/forms/CdmFormFactory.java | 3 +++ .../taxeditor/ui/forms/ImageElement.java | 2 +- .../ui/section/AbstractCdmDetailElement.java | 1 + .../ui/section/media/ImageFileElement.java | 5 ++--- .../media/MediaRepresentationElement.java | 11 +++-------- .../reference/ReferenceDetailElement.java | 2 +- .../ui/section/taxon/TaxonBaseDetailElement.java | 2 -- .../ui/selection/AbstractSelectionElement.java | 2 +- .../ui/translation/TranslationWizardPage.java | 4 +++- 13 files changed, 32 insertions(+), 26 deletions(-) diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF index d4ccb89a7..755dd68ac 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF @@ -203,7 +203,7 @@ Export-Package: com.google.api, org.aspectj.runtime.internal, eu.etaxonomy.cdm.model.common", eu.etaxonomy.cdm.common;uses:="org.jdom.output,org.jdom", - eu.etaxonomy.cdm.common.mediaMetaData, + eu.etaxonomy.cdm.common.media, eu.etaxonomy.cdm.database; uses:="org.springframework.transaction, org.apache.log4j, diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/AcceptedNameContainer.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/AcceptedNameContainer.java index 2e28b95ab..4771ca313 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/AcceptedNameContainer.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/AcceptedNameContainer.java @@ -10,10 +10,8 @@ package eu.etaxonomy.taxeditor.editor.name.container; import org.eclipse.swt.graphics.Font; -import eu.etaxonomy.cdm.model.taxon.Synonym; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.taxeditor.editor.EditorUtil; -import eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor; import eu.etaxonomy.taxeditor.preference.Resources; /** diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmFormElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmFormElement.java index d372d15ff..bbc1864b0 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmFormElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmFormElement.java @@ -3,6 +3,7 @@ */ package eu.etaxonomy.taxeditor.ui.forms; +import java.util.ConcurrentModificationException; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -13,7 +14,6 @@ import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Event; import org.eclipse.ui.forms.widgets.Section; import eu.etaxonomy.taxeditor.store.StoreUtil; @@ -234,9 +234,17 @@ public abstract class AbstractCdmFormElement implements IPropertyChangeEmitter, /** {@inheritDoc} */ public void firePropertyChangeEvent(CdmPropertyChangeEvent event) { Assert.isNotNull(propertyChangeListeners, "Property change listeners are not present"); - - for(Object listener : propertyChangeListeners){ - ((IPropertyChangeListener)listener).propertyChange(event); + + try{ + for(Object listener : propertyChangeListeners){ + ((IPropertyChangeListener)listener).propertyChange(event); + } + }catch(ConcurrentModificationException e){ + // There are two cases that produce a CME. + // Described here: http://dev.e-taxonomy.eu/trac/ticket/2363#comment:2 + // and here: http://dev.e-taxonomy.eu/trac/ticket/2438 + // Ignoring the CME because nothing bad is happening + StoreUtil.warn(getClass(), "ConcurrentModificationException. Can be ignored."); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractFormSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractFormSection.java index 311d7b0cf..d1587708d 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractFormSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractFormSection.java @@ -25,7 +25,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.TypedListener; import org.eclipse.swt.widgets.Widget; -import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.forms.widgets.Section; import org.eclipse.ui.forms.widgets.TableWrapLayout; import org.eclipse.ui.forms.widgets.ToggleHyperlink; @@ -34,6 +33,9 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; import eu.etaxonomy.taxeditor.store.StoreUtil; +import eu.etaxonomy.taxeditor.ui.selection.AbstractSelectionElement; +import eu.etaxonomy.taxeditor.ui.term.AbstractEnumComboElement; +import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement; /** *

Abstract AbstractFormSection class.

@@ -394,7 +396,7 @@ public abstract class AbstractFormSection extends Section implements ISe if(formElement == this){ return true; }else{ - for(ICdmFormElement element : getElements()){ + for(ICdmFormElement element : getElements()){ boolean contains = element.containsFormElement(formElement); if(contains == true){ return true; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CdmFormFactory.java index c39545b48..73c96492b 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CdmFormFactory.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CdmFormFactory.java @@ -1481,6 +1481,9 @@ public class CdmFormFactory extends FormToolkit { * object. */ public void addPropertyChangeListener(IPropertyChangeListener listener) { + if(propertyChangeListeners.contains(listener)){ + return; + } propertyChangeListeners.add(0, listener); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ImageElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ImageElement.java index b3ff73fd4..2eb860091 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ImageElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ImageElement.java @@ -156,7 +156,7 @@ public class ImageElement extends AbstractCdmFormElement implements PaintListene } monitor.done(); }catch (Exception e) { - StoreUtil.warn(getClass(), e); + StoreUtil.warn(getClass(), e.getMessage()); } } }; 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 f20cd8780..ad6b985c0 100644 --- 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 @@ -178,6 +178,7 @@ public abstract class AbstractCdmDetailElement extends if(eventSource instanceof ICdmFormElement){ ICdmFormElement eventElement = (ICdmFormElement) eventSource; ICdmFormElement eventElementContainer = eventElement.getParentElement(); + if (eventElementContainer == this){ if(event instanceof CdmPropertyChangeEvent){ if(((CdmPropertyChangeEvent) event).hasException()){ diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java index df7949b58..c155efba1 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java @@ -19,7 +19,7 @@ import org.apache.commons.lang.StringUtils; import org.eclipse.swt.events.SelectionListener; import eu.etaxonomy.cdm.api.service.IMediaService; -import eu.etaxonomy.cdm.common.mediaMetaData.ImageMetaData; +import eu.etaxonomy.cdm.common.media.ImageInfo; import eu.etaxonomy.cdm.model.media.ImageFile; import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.store.StoreUtil; @@ -105,10 +105,9 @@ public class ImageFileElement extends AbstractMediaRepresentationPartElement extends protected void setSelectionInternal(T selection) { if (selection != null && !selection.equals(this.entity)) { setEntity(selection); - firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null)); + getParentElement().firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null)); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizardPage.java index 4206a8949..1113625a0 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizardPage.java @@ -16,6 +16,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -30,11 +31,11 @@ import eu.etaxonomy.cdm.model.common.MultilanguageTextHelper; import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory; +import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType; import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.forms.LanguageStringWithLabelElement; import eu.etaxonomy.taxeditor.ui.forms.MultilanguageTextElement; import eu.etaxonomy.taxeditor.ui.forms.RootElement; -import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType; import eu.etaxonomy.taxeditor.ui.term.EmptyComboElement; import eu.etaxonomy.taxeditor.ui.term.LanguageComboElement; @@ -70,6 +71,7 @@ public class TranslationWizardPage extends WizardPage{ */ protected TranslationWizardPage(Map multilanguageText) { super("TranslationWizardPage"); + Assert.isNotNull(multilanguageText, "Multilanguage text may not be null"); setTitle("Add or edit translations."); this.multilanguageText = multilanguageText; formFactory = new CdmFormFactory(Display.getCurrent()); -- 2.34.1