BGBM BDI Projects
/
taxeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge-update from trunk
[taxeditor.git]
/
eu.etaxonomy.taxeditor.store
/
src
/
main
/
java
/
eu
/
etaxonomy
/
taxeditor
/
ui
/
section
/
description
/
ScopeSection.java
diff --git
a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeSection.java
b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeSection.java
index e3dd9c323bd23f24af4a8fa4370237a59141dc9d..81bb68a373a4b30d971fbfcf6696b46153329137 100644
(file)
--- a/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeSection.java
+++ b/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeSection.java
@@
-12,13
+12,12
@@
package eu.etaxonomy.taxeditor.ui.section.description;
import java.util.Collection;
import java.util.Collection;
-import org.apache.log4j.Logger;
-
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.model.description.Scope;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
import eu.etaxonomy.cdm.model.description.TaxonDescription;
import eu.etaxonomy.cdm.model.description.TaxonDescription;
-import eu.etaxonomy.taxeditor.ui.
forms.CdmFormFactory
;
-import eu.etaxonomy.taxeditor.ui.
forms.ICdmFormElement
;
+import eu.etaxonomy.taxeditor.ui.
campanula.compatibility.ICdmFormElement
;
+import eu.etaxonomy.taxeditor.ui.
element.CdmFormFactory
;
import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
/**
import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
/**
@@
-28,17
+27,14
@@
import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
* @created Mar 18, 2010
* @version 1.0
*/
* @created Mar 18, 2010
* @version 1.0
*/
-public class ScopeSection extends AbstractEntityCollectionSection<TaxonDescription, Scope> {
-
-
- private static final Logger logger = Logger.getLogger(ScopeSection.class);
+public class ScopeSection extends AbstractEntityCollectionSection<TaxonDescription, DefinedTerm> {
/**
* <p>Constructor for ScopeSection.</p>
*
/**
* <p>Constructor for ScopeSection.</p>
*
- * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.
forms
.CdmFormFactory} object.
+ * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.
element
.CdmFormFactory} object.
* @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
* @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
- * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.
forms
.ICdmFormElement} object.
+ * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.
element
.ICdmFormElement} object.
* @param style a int.
*/
public ScopeSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation, ICdmFormElement parentElement, int style) {
* @param style a int.
*/
public ScopeSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation, ICdmFormElement parentElement, int style) {
@@
-47,19
+43,19
@@
public class ScopeSection extends AbstractEntityCollectionSection<TaxonDescripti
/** {@inheritDoc} */
@Override
/** {@inheritDoc} */
@Override
- public void addElement(
Scope
element) {
+ public void addElement(
DefinedTerm
element) {
getEntity().addScope(element);
}
/** {@inheritDoc} */
@Override
getEntity().addScope(element);
}
/** {@inheritDoc} */
@Override
- public
Scope createNewElement() {
- return
Scope.NewInstance();
+ public
DefinedTerm createNewElement() {
+ return
DefinedTerm.NewInstance(TermType.Scope,"","Untitled","");
}
/** {@inheritDoc} */
@Override
}
/** {@inheritDoc} */
@Override
- public Collection<
Scope
> getCollection(TaxonDescription entity) {
+ public Collection<
DefinedTerm
> getCollection(TaxonDescription entity) {
return entity.getScopes();
}
return entity.getScopes();
}
@@
-77,7
+73,7
@@
public class ScopeSection extends AbstractEntityCollectionSection<TaxonDescripti
/** {@inheritDoc} */
@Override
/** {@inheritDoc} */
@Override
- public void removeElement(
Scope
element) {
+ public void removeElement(
DefinedTerm
element) {
getEntity().removeScope(element);
}
}
getEntity().removeScope(element);
}
}