From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Wed, 8 Jan 2014 16:32:50 +0000 (+0000)
Subject: merge-update from trunk
X-Git-Tag: 3.6.0~841^2~12
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/c3efc10a8ccfc08ef6fe227b58b22842bcc5ae69

merge-update from trunk
---

c3efc10a8ccfc08ef6fe227b58b22842bcc5ae69
diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailElement.java
index c87d90c01,3c191efe9..0780d0714
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailElement.java
@@@ -6,9 -6,10 +6,10 @@@ package eu.etaxonomy.taxeditor.ui.secti
  import org.eclipse.swt.SWT;
  
  import eu.etaxonomy.cdm.model.description.PolytomousKey;
 +import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
  import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
  import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;
 -import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+ import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement;
  import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement;
  
  /**
diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java
index 7878c6796,a04959021..d7df9fa7c
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java
@@@ -11,8 -11,9 +11,9 @@@ package eu.etaxonomy.taxeditor.ui.secti
  
  import eu.etaxonomy.cdm.model.common.DefinedTermBase;
  import eu.etaxonomy.cdm.model.common.TermVocabulary;
 +import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
  import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 -import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+ import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
  
  /**
   * @author l.morris