reintegrated model changes from branch 3.3-MC-SNAPSHOT

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / key / ScopeRestrictionSection.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java
index dcc723ef614c28a221deb19fd003db0270898cec..a0c12f1ae9c5bf29bbd9361cb2698429dbead165 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java
@@ -6,8 +6,9 @@ package eu.etaxonomy.taxeditor.ui.section.key;
 import java.util.Collection;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
-import eu.etaxonomy.cdm.model.description.Scope;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
@@ -16,7 +17,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
  * @author n.hoffmann
  *
  */
-public class ScopeRestrictionSection extends AbstractEntityCollectionSection<PolytomousKey, Scope> {
+public class ScopeRestrictionSection extends AbstractEntityCollectionSection<PolytomousKey, DefinedTerm> {
 
        public ScopeRestrictionSection(CdmFormFactory formFactory,
                        ConversationHolder conversation, ICdmFormElement parentElement, int style) {
@@ -24,22 +25,23 @@ public class ScopeRestrictionSection extends AbstractEntityCollectionSection<Pol
        }
 
        @Override
-       public Collection<Scope> getCollection(PolytomousKey entity) {
+       public Collection<DefinedTerm> getCollection(PolytomousKey entity) {
                return entity.getScopeRestrictions();
        }
 
        @Override
-       public Scope createNewElement() {
-               return Scope.NewInstance();
+       public DefinedTerm createNewElement() {         
+               return DefinedTerm.NewInstance(TermType.Scope,"","Untitled","");
+                       
        }
 
        @Override
-       public void addElement(Scope element) {
+       public void addElement(DefinedTerm element) {
                getEntity().addScopeRestriction(element);
        }
 
        @Override
-       public void removeElement(Scope element) {
+       public void removeElement(DefinedTerm element) {
                getEntity().removeScopeRestriction(element);
        }