Revision 49a64920
Added by Cherian Mathew almost 11 years ago
| eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AbstractAddDerivedUnitFacadeMediaHandler.java | ||
|---|---|---|
| 21 | 21 |
import org.eclipse.ui.IWorkbenchPart; |
| 22 | 22 |
import org.eclipse.ui.handlers.HandlerUtil; |
| 23 | 23 |
|
| 24 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
|
|
| 24 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
|
| 25 | 25 |
import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor; |
| 26 | 26 |
import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; |
| 27 | 27 |
import eu.etaxonomy.taxeditor.bulkeditor.derivedunit.operation.AddDerivedUnitFacadeMediaOperation; |
| ... | ... | |
| 55 | 55 |
|
| 56 | 56 |
if(selection instanceof IStructuredSelection){
|
| 57 | 57 |
Object element = ((IStructuredSelection) selection).getFirstElement(); |
| 58 |
if(element instanceof DerivedUnitBase){
|
|
| 58 |
if(element instanceof DerivedUnit){
|
|
| 59 | 59 |
|
| 60 | 60 |
try{
|
| 61 |
AbstractPostOperation operation = new AddDerivedUnitFacadeMediaOperation(event.getCommand().getName(), BulkEditorUtil.getUndoContext(), (DerivedUnitBase) element, getMode(), postOperationEnabled);
|
|
| 61 |
AbstractPostOperation operation = new AddDerivedUnitFacadeMediaOperation(event.getCommand().getName(), BulkEditorUtil.getUndoContext(), (DerivedUnit) element, getMode(), postOperationEnabled); |
|
| 62 | 62 |
BulkEditorUtil.executeOperation(operation); |
| 63 | 63 |
} catch (NotDefinedException e) {
|
| 64 | 64 |
BulkEditorUtil.warn(getClass(), "Command name not set."); |
| eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java | ||
|---|---|---|
| 20 | 20 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException; |
| 21 | 21 |
import eu.etaxonomy.cdm.model.description.DescriptionBase; |
| 22 | 22 |
import eu.etaxonomy.cdm.model.description.SpecimenDescription; |
| 23 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
|
|
| 23 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
|
| 24 | 24 |
import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; |
| 25 | 25 |
import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; |
| 26 | 26 |
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; |
| ... | ... | |
| 36 | 36 |
public static final int DERIVED_UNIT_MEDIA = 0; |
| 37 | 37 |
public static final int FIELD_OBJECT_MEDIA = 1; |
| 38 | 38 |
|
| 39 |
private DerivedUnitBase derivedUnit;
|
|
| 39 |
private DerivedUnit derivedUnit; |
|
| 40 | 40 |
private int mode; |
| 41 | 41 |
|
| 42 | 42 |
/** |
| ... | ... | |
| 44 | 44 |
* @param undoContext |
| 45 | 45 |
* @param postOperationEnabled |
| 46 | 46 |
*/ |
| 47 |
public AddDerivedUnitFacadeMediaOperation(String label, IUndoContext undoContext, DerivedUnitBase derivedUnit,
|
|
| 47 |
public AddDerivedUnitFacadeMediaOperation(String label, IUndoContext undoContext, DerivedUnit derivedUnit, |
|
| 48 | 48 |
int mode, IPostOperationEnabled postOperationEnabled) {
|
| 49 | 49 |
super(label, undoContext, postOperationEnabled); |
| 50 | 50 |
|
| eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java | ||
|---|---|---|
| 17 | 17 |
|
| 18 | 18 |
import eu.etaxonomy.cdm.model.molecular.DnaSample; |
| 19 | 19 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
| 20 |
import eu.etaxonomy.cdm.model.occurrence.FieldObservation; |
|
| 21 |
import eu.etaxonomy.cdm.model.occurrence.Fossil; |
|
| 22 |
import eu.etaxonomy.cdm.model.occurrence.LivingBeing; |
|
| 23 |
import eu.etaxonomy.cdm.model.occurrence.Observation; |
|
| 24 |
import eu.etaxonomy.cdm.model.occurrence.Specimen; |
|
| 20 |
import eu.etaxonomy.cdm.model.occurrence.FieldUnit; |
|
| 25 | 21 |
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; |
| 26 | 22 |
import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator; |
| 27 | 23 |
|
| ... | ... | |
| 42 | 38 |
/** {@inheritDoc} */
|
| 43 | 39 |
@Override |
| 44 | 40 |
public SpecimenOrObservationBase createEntity(String text) {
|
| 45 |
return createEntity(Specimen.class, text);
|
|
| 41 |
return createEntity(DerivedUnit.class, text);
|
|
| 46 | 42 |
} |
| 47 | 43 |
|
| 48 | 44 |
/** {@inheritDoc} */
|
| 49 | 45 |
@Override |
| 50 | 46 |
public SpecimenOrObservationBase createEntity(Object key, String text) {
|
| 51 | 47 |
SpecimenOrObservationBase specimenOrObservation = null; |
| 52 |
|
|
| 53 |
if (FieldObservation.class.equals((key))) {
|
|
| 54 |
specimenOrObservation = FieldObservation.NewInstance(); |
|
| 48 |
//FIXME:3.3MC |
|
| 49 |
if (FieldUnit.class.equals((key))) {
|
|
| 50 |
specimenOrObservation = FieldUnit.NewInstance(); |
|
| 51 |
} else if (DerivedUnit.class.equals((key))) {
|
|
| 52 |
specimenOrObservation = DerivedUnit.NewInstance(); |
|
| 53 |
} else if (DerivedUnit.class.equals((key))) {
|
|
| 54 |
specimenOrObservation = DerivedUnit.NewInstance(); |
|
| 55 |
} else if (DerivedUnit.class.equals((key))) {
|
|
| 56 |
specimenOrObservation = DerivedUnit.NewInstance(); |
|
| 55 | 57 |
} else if (DerivedUnit.class.equals((key))) {
|
| 56 | 58 |
specimenOrObservation = DerivedUnit.NewInstance(); |
| 57 |
} else if (LivingBeing.class.equals((key))) {
|
|
| 58 |
specimenOrObservation = LivingBeing.NewInstance(); |
|
| 59 |
} else if (Observation.class.equals((key))) {
|
|
| 60 |
specimenOrObservation = Observation.NewInstance(); |
|
| 61 |
} else if (Specimen.class.equals((key))) {
|
|
| 62 |
specimenOrObservation = Specimen.NewInstance(); |
|
| 63 | 59 |
} else if (DnaSample.class.equals((key))) {
|
| 64 | 60 |
specimenOrObservation = DnaSample.NewInstance(); |
| 65 |
} else if (Fossil.class.equals((key))) {
|
|
| 66 |
specimenOrObservation = Fossil.NewInstance();
|
|
| 61 |
} else if (DerivedUnit.class.equals((key))) {
|
|
| 62 |
specimenOrObservation = DerivedUnit.NewInstance();
|
|
| 67 | 63 |
} |
| 68 | 64 |
|
| 69 | 65 |
if (specimenOrObservation != null) {
|
| ... | ... | |
| 83 | 79 |
public Map<Object, String> getKeyLabelPairs() {
|
| 84 | 80 |
Map<Object, String> result = new HashMap<Object, String>(); |
| 85 | 81 |
|
| 86 |
result.put(Specimen.class, "Specimen"); |
|
| 87 |
result.put(Observation.class, "Observation"); |
|
| 88 |
result.put(LivingBeing.class, "Living Being"); |
|
| 89 |
result.put(Fossil.class, "Fossil"); |
|
| 82 |
//FIXME:3.3MC |
|
| 83 |
result.put(DerivedUnit.class, "Specimen"); |
|
| 84 |
result.put(DerivedUnit.class, "Observation"); |
|
| 85 |
result.put(DerivedUnit.class, "Living Being"); |
|
| 86 |
result.put(DerivedUnit.class, "Fossil"); |
|
| 90 | 87 |
result.put(DerivedUnit.class, "Derived Unit"); |
| 91 | 88 |
|
| 92 | 89 |
// Omitted at the moment see #2266 |
| eu.etaxonomy.taxeditor.cdmlib/.classpath | ||
|---|---|---|
| 25 | 25 |
<classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/> |
| 26 | 26 |
<classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/> |
| 27 | 27 |
<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.2.jar"/> |
| 28 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.2.2-SNAPSHOT-sources.jar"/> |
|
| 29 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.2.2-SNAPSHOT.jar"/> |
|
| 30 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.2.2-SNAPSHOT-sources.jar"/> |
|
| 31 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.2.2-SNAPSHOT.jar"/> |
|
| 32 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.2.2-SNAPSHOT-sources.jar"/> |
|
| 33 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.2.2-SNAPSHOT.jar"/> |
|
| 34 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.2.2-SNAPSHOT-sources.jar"/> |
|
| 35 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.2.2-SNAPSHOT.jar"/> |
|
| 36 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.2.2-SNAPSHOT-sources.jar"/> |
|
| 37 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.2.2-SNAPSHOT.jar"/> |
|
| 38 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.2.2-SNAPSHOT-sources.jar"/> |
|
| 39 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.2.2-SNAPSHOT.jar"/> |
|
| 40 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.2.2-SNAPSHOT-sources.jar"/> |
|
| 41 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.2.2-SNAPSHOT.jar"/> |
|
| 42 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.2.2-SNAPSHOT-sources.jar"/> |
|
| 43 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.2.2-SNAPSHOT.jar"/> |
|
| 44 | 28 |
<classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.2.jar"/> |
| 45 | 29 |
<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/> |
| 46 | 30 |
<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/> |
| ... | ... | |
| 204 | 188 |
<classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/> |
| 205 | 189 |
<classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/> |
| 206 | 190 |
<classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/> |
| 191 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.0-SNAPSHOT-sources.jar"/> |
|
| 192 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.0-SNAPSHOT.jar"/> |
|
| 193 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.0-SNAPSHOT-sources.jar"/> |
|
| 194 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.0-SNAPSHOT.jar"/> |
|
| 195 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.0-SNAPSHOT-sources.jar"/> |
|
| 196 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.0-SNAPSHOT.jar"/> |
|
| 197 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.0-SNAPSHOT-sources.jar"/> |
|
| 198 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.3.0-SNAPSHOT-sources.jar"/> |
|
| 199 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.0-SNAPSHOT-sources.jar"/> |
|
| 200 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.0-SNAPSHOT.jar"/> |
|
| 201 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.0-SNAPSHOT-sources.jar"/> |
|
| 202 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.0-SNAPSHOT.jar"/> |
|
| 203 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.0-SNAPSHOT-sources.jar"/> |
|
| 204 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.0-SNAPSHOT.jar"/> |
|
| 205 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.0-SNAPSHOT-sources.jar"/> |
|
| 206 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.0-SNAPSHOT.jar"/> |
|
| 207 | 207 |
<classpathentry kind="output" path="target/classes"/> |
| 208 | 208 |
</classpath> |
| eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF | ||
|---|---|---|
| 416 | 416 |
lib/batik-util-1.7.jar, |
| 417 | 417 |
lib/batik-xml-1.7.jar, |
| 418 | 418 |
lib/c3p0-0.9.2.jar, |
| 419 |
lib/cdmlib-commons-3.2.3-SNAPSHOT-sources.jar, |
|
| 420 |
lib/cdmlib-commons-3.2.3-SNAPSHOT.jar, |
|
| 421 |
lib/cdmlib-ext-3.2.3-SNAPSHOT-sources.jar, |
|
| 422 |
lib/cdmlib-ext-3.2.3-SNAPSHOT.jar, |
|
| 423 |
lib/cdmlib-io-3.2.3-SNAPSHOT-sources.jar, |
|
| 424 |
lib/cdmlib-io-3.2.3-SNAPSHOT.jar, |
|
| 425 |
lib/cdmlib-model-3.2.3-SNAPSHOT-sources.jar, |
|
| 426 |
lib/cdmlib-model-3.2.3-SNAPSHOT.jar, |
|
| 427 |
lib/cdmlib-persistence-3.2.3-SNAPSHOT-sources.jar, |
|
| 428 |
lib/cdmlib-persistence-3.2.3-SNAPSHOT.jar, |
|
| 429 |
lib/cdmlib-print-3.2.3-SNAPSHOT-sources.jar, |
|
| 430 |
lib/cdmlib-print-3.2.3-SNAPSHOT.jar, |
|
| 431 |
lib/cdmlib-remote-3.2.3-SNAPSHOT-sources.jar, |
|
| 432 |
lib/cdmlib-remote-3.2.3-SNAPSHOT.jar, |
|
| 433 |
lib/cdmlib-services-3.2.3-SNAPSHOT-sources.jar, |
|
| 434 |
lib/cdmlib-services-3.2.3-SNAPSHOT.jar, |
|
| 435 | 419 |
lib/cglib-nodep-2.2.2.jar, |
| 436 | 420 |
lib/com.springsource.org.aopalliance-1.0.0.jar, |
| 437 | 421 |
lib/com.springsource.org.apache.commons.logging-1.1.1.jar, |
| ... | ... | |
| 594 | 578 |
lib/yjp-controller-api-redist-9.0.8.jar, |
| 595 | 579 |
lib/google-api-translate-java-0.92.jar, |
| 596 | 580 |
lib/odfdom-0.8.jar, |
| 597 |
lib/h2mig_pagestore_addon.jar |
|
| 581 |
lib/h2mig_pagestore_addon.jar, |
|
| 582 |
lib/cdmlib-commons-3.3.0-SNAPSHOT-sources.jar, |
|
| 583 |
lib/cdmlib-commons-3.3.0-SNAPSHOT.jar, |
|
| 584 |
lib/cdmlib-ext-3.3.0-SNAPSHOT-sources.jar, |
|
| 585 |
lib/cdmlib-ext-3.3.0-SNAPSHOT.jar, |
|
| 586 |
lib/cdmlib-io-3.3.0-SNAPSHOT-sources.jar, |
|
| 587 |
lib/cdmlib-io-3.3.0-SNAPSHOT.jar, |
|
| 588 |
lib/cdmlib-model-3.3.0-SNAPSHOT-sources.jar, |
|
| 589 |
lib/cdmlib-model-3.3.0-SNAPSHOT.jar, |
|
| 590 |
lib/cdmlib-persistence-3.3.0-SNAPSHOT-sources.jar, |
|
| 591 |
lib/cdmlib-persistence-3.3.0-SNAPSHOT.jar, |
|
| 592 |
lib/cdmlib-print-3.3.0-SNAPSHOT-sources.jar, |
|
| 593 |
lib/cdmlib-print-3.3.0-SNAPSHOT.jar, |
|
| 594 |
lib/cdmlib-remote-3.3.0-SNAPSHOT-sources.jar, |
|
| 595 |
lib/cdmlib-remote-3.3.0-SNAPSHOT.jar, |
|
| 596 |
lib/cdmlib-services-3.3.0-SNAPSHOT-sources.jar, |
|
| 597 |
lib/cdmlib-services-3.3.0-SNAPSHOT.jar |
|
| eu.etaxonomy.taxeditor.cdmlib/build.properties | ||
|---|---|---|
| 22 | 22 |
lib/batik-util-1.7.jar,\ |
| 23 | 23 |
lib/batik-xml-1.7.jar,\ |
| 24 | 24 |
lib/c3p0-0.9.2.jar,\ |
| 25 |
lib/cdmlib-commons-3.2.3-SNAPSHOT-sources.jar,\ |
|
| 26 |
lib/cdmlib-commons-3.2.3-SNAPSHOT.jar,\ |
|
| 27 |
lib/cdmlib-ext-3.2.3-SNAPSHOT-sources.jar,\ |
|
| 28 |
lib/cdmlib-ext-3.2.3-SNAPSHOT.jar,\ |
|
| 29 |
lib/cdmlib-io-3.2.3-SNAPSHOT-sources.jar,\ |
|
| 30 |
lib/cdmlib-io-3.2.3-SNAPSHOT.jar,\ |
|
| 31 |
lib/cdmlib-model-3.2.3-SNAPSHOT-sources.jar,\ |
|
| 32 |
lib/cdmlib-model-3.2.3-SNAPSHOT.jar,\ |
|
| 33 |
lib/cdmlib-persistence-3.2.3-SNAPSHOT-sources.jar,\ |
|
| 34 |
lib/cdmlib-persistence-3.2.3-SNAPSHOT.jar,\ |
|
| 35 |
lib/cdmlib-print-3.2.3-SNAPSHOT-sources.jar,\ |
|
| 36 |
lib/cdmlib-print-3.2.3-SNAPSHOT.jar,\ |
|
| 37 |
lib/cdmlib-remote-3.2.3-SNAPSHOT-sources.jar,\ |
|
| 38 |
lib/cdmlib-remote-3.2.3-SNAPSHOT.jar,\ |
|
| 39 |
lib/cdmlib-services-3.2.3-SNAPSHOT-sources.jar,\ |
|
| 40 |
lib/cdmlib-services-3.2.3-SNAPSHOT.jar,\ |
|
| 41 | 25 |
lib/cglib-nodep-2.2.2.jar,\ |
| 42 | 26 |
lib/com.springsource.org.aopalliance-1.0.0.jar,\ |
| 43 | 27 |
lib/com.springsource.org.apache.commons.logging-1.1.1.jar,\ |
| ... | ... | |
| 200 | 184 |
lib/yjp-controller-api-redist-9.0.8.jar,\ |
| 201 | 185 |
lib/google-api-translate-java-0.92.jar,\ |
| 202 | 186 |
lib/odfdom-0.8.jar,\ |
| 203 |
lib/h2mig_pagestore_addon.jar |
|
| 187 |
lib/h2mig_pagestore_addon.jar,\ |
|
| 188 |
lib/cdmlib-commons-3.3.0-SNAPSHOT-sources.jar,\ |
|
| 189 |
lib/cdmlib-commons-3.3.0-SNAPSHOT.jar,\ |
|
| 190 |
lib/cdmlib-ext-3.3.0-SNAPSHOT-sources.jar,\ |
|
| 191 |
lib/cdmlib-ext-3.3.0-SNAPSHOT.jar,\ |
|
| 192 |
lib/cdmlib-io-3.3.0-SNAPSHOT-sources.jar,\ |
|
| 193 |
lib/cdmlib-io-3.3.0-SNAPSHOT.jar,\ |
|
| 194 |
lib/cdmlib-model-3.3.0-SNAPSHOT-sources.jar,\ |
|
| 195 |
lib/cdmlib-model-3.3.0-SNAPSHOT.jar,\ |
|
| 196 |
lib/cdmlib-persistence-3.3.0-SNAPSHOT-sources.jar,\ |
|
| 197 |
lib/cdmlib-persistence-3.3.0-SNAPSHOT.jar,\ |
|
| 198 |
lib/cdmlib-print-3.3.0-SNAPSHOT-sources.jar,\ |
|
| 199 |
lib/cdmlib-print-3.3.0-SNAPSHOT.jar,\ |
|
| 200 |
lib/cdmlib-remote-3.3.0-SNAPSHOT-sources.jar,\ |
|
| 201 |
lib/cdmlib-remote-3.3.0-SNAPSHOT.jar,\ |
|
| 202 |
lib/cdmlib-services-3.3.0-SNAPSHOT-sources.jar,\ |
|
| 203 |
lib/cdmlib-services-3.3.0-SNAPSHOT.jar |
|
| 204 | 204 |
|
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java | ||
|---|---|---|
| 18 | 18 |
import eu.etaxonomy.cdm.api.service.IFeatureTreeService; |
| 19 | 19 |
import eu.etaxonomy.cdm.api.service.ITermService; |
| 20 | 20 |
import eu.etaxonomy.cdm.api.service.IVocabularyService; |
| 21 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
|
| 21 | 22 |
import eu.etaxonomy.cdm.model.common.MarkerType; |
| 22 | 23 |
import eu.etaxonomy.cdm.model.common.TermVocabulary; |
| 23 | 24 |
import eu.etaxonomy.cdm.model.description.Feature; |
| 24 | 25 |
import eu.etaxonomy.cdm.model.description.FeatureNode; |
| 25 | 26 |
import eu.etaxonomy.cdm.model.description.FeatureTree; |
| 26 |
import eu.etaxonomy.cdm.model.description.Modifier; |
|
| 27 | 27 |
import eu.etaxonomy.cdm.model.description.State; |
| 28 | 28 |
import eu.etaxonomy.taxeditor.model.ContextListenerAdapter; |
| 29 | 29 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
| ... | ... | |
| 122 | 122 |
|
| 123 | 123 |
|
| 124 | 124 |
private void createHumanGroupVocabulary(IProgressMonitor monitor,ConversationHolder conversation) {
|
| 125 |
TermVocabulary<Modifier> humanGroupVocabulary = (TermVocabulary<Modifier>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidHumanGroupVocabulary);
|
|
| 125 |
TermVocabulary<DefinedTerm> humanGroupVocabulary = (TermVocabulary<DefinedTerm>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidHumanGroupVocabulary);
|
|
| 126 | 126 |
if (humanGroupVocabulary == null){
|
| 127 | 127 |
monitor.subTask("create human group vocabulary");
|
| 128 | 128 |
URI termSourceUri = null; |
| 129 | 129 |
try {
|
| 130 |
termSourceUri = new URI("eu.etaxonomy.cdm.model.description.Modifier");
|
|
| 130 |
termSourceUri = new URI("eu.etaxonomy.cdm.model.description.DefinedTerm");
|
|
| 131 | 131 |
} catch (URISyntaxException e) {
|
| 132 | 132 |
e.printStackTrace(); |
| 133 | 133 |
} |
| 134 | 134 |
humanGroupVocabulary = TermVocabulary.NewInstance(UsageTermCollection.humanGroupLabel, UsageTermCollection.humanGroupLabel, null, termSourceUri); |
| 135 | 135 |
humanGroupVocabulary.setUuid(UsageTermCollection.uuidHumanGroupVocabulary); |
| 136 |
Modifier newDummyModifier = Modifier.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
|
|
| 136 |
DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
|
|
| 137 | 137 |
newDummyModifier.setUuid(UsageTermCollection.uuidHumanGroupDummy); |
| 138 |
Modifier newSubDummyModifier = Modifier.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
|
|
| 138 |
DefinedTerm newSubDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
|
|
| 139 | 139 |
newSubDummyModifier.setUuid(UsageTermCollection.uuidEthnicGroupDummy); |
| 140 | 140 |
newDummyModifier.addIncludes(newSubDummyModifier); |
| 141 | 141 |
humanGroupVocabulary.addTerm(newDummyModifier); |
| ... | ... | |
| 146 | 146 |
|
| 147 | 147 |
|
| 148 | 148 |
private void createPlantVocabulary(IProgressMonitor monitor, ConversationHolder conversation) {
|
| 149 |
TermVocabulary<Modifier> plantPartVocabulary = (TermVocabulary<Modifier>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidPlantPartVocabulary);
|
|
| 149 |
TermVocabulary<DefinedTerm> plantPartVocabulary = (TermVocabulary<DefinedTerm>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidPlantPartVocabulary);
|
|
| 150 | 150 |
if (plantPartVocabulary == null){
|
| 151 | 151 |
monitor.subTask("create plant part vocabulary");
|
| 152 | 152 |
URI termSourceUri = null; |
| 153 | 153 |
try {
|
| 154 |
termSourceUri = new URI("eu.etaxonomy.cdm.model.description.Modifier");
|
|
| 154 |
termSourceUri = new URI("eu.etaxonomy.cdm.model.description.DefinedTerm");
|
|
| 155 | 155 |
} catch (URISyntaxException e) {
|
| 156 | 156 |
e.printStackTrace(); |
| 157 | 157 |
} |
| 158 | 158 |
plantPartVocabulary = TermVocabulary.NewInstance(UsageTermCollection.plantPartLabel, UsageTermCollection.plantPartLabel, null, termSourceUri); |
| 159 | 159 |
plantPartVocabulary.setUuid(UsageTermCollection.uuidPlantPartVocabulary); |
| 160 |
Modifier newDummyModifier = Modifier.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
|
|
| 160 |
DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
|
|
| 161 | 161 |
newDummyModifier.setUuid(UsageTermCollection.uuidPlantPartDummy); |
| 162 | 162 |
plantPartVocabulary.addTerm(newDummyModifier); |
| 163 | 163 |
CdmStore.getService(IVocabularyService.class).saveOrUpdate(plantPartVocabulary); |
| ... | ... | |
| 167 | 167 |
|
| 168 | 168 |
|
| 169 | 169 |
private void createCountryVocabulary(IProgressMonitor monitor, ConversationHolder conversation) {
|
| 170 |
TermVocabulary<Modifier> countryVocabulary = (TermVocabulary<Modifier>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidCountryVocabulary);
|
|
| 170 |
TermVocabulary<DefinedTerm> countryVocabulary = (TermVocabulary<DefinedTerm>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidCountryVocabulary);
|
|
| 171 | 171 |
if (countryVocabulary == null){
|
| 172 | 172 |
monitor.subTask("create country vocabulary");
|
| 173 | 173 |
URI termSourceUri = null; |
| 174 | 174 |
try {
|
| 175 |
termSourceUri = new URI("eu.etaxonomy.cdm.model.description.Modifier");
|
|
| 175 |
termSourceUri = new URI("eu.etaxonomy.cdm.model.description.DefinedTerm");
|
|
| 176 | 176 |
} catch (URISyntaxException e) {
|
| 177 | 177 |
e.printStackTrace(); |
| 178 | 178 |
} |
| 179 | 179 |
countryVocabulary = TermVocabulary.NewInstance(UsageTermCollection.countryLabel, UsageTermCollection.countryLabel, null, termSourceUri); |
| 180 | 180 |
countryVocabulary.setUuid(UsageTermCollection.uuidCountryVocabulary); |
| 181 |
Modifier newDummyModifier = Modifier.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
|
|
| 181 |
DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
|
|
| 182 | 182 |
newDummyModifier.setUuid(UsageTermCollection.uuidCountryDummy); |
| 183 | 183 |
countryVocabulary.addTerm(newDummyModifier); |
| 184 | 184 |
CdmStore.getService(IVocabularyService.class).saveOrUpdate(countryVocabulary); |
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java | ||
|---|---|---|
| 25 | 25 |
import eu.etaxonomy.cdm.model.description.DescriptionElementBase; |
| 26 | 26 |
import eu.etaxonomy.cdm.model.description.SpecimenDescription; |
| 27 | 27 |
import eu.etaxonomy.cdm.model.media.Media; |
| 28 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
|
|
| 28 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
|
| 29 | 29 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| 30 | 30 |
import eu.etaxonomy.taxeditor.editor.EditorUtil; |
| 31 | 31 |
import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; |
| ... | ... | |
| 63 | 63 |
return getImages((DescriptionBase) parentElement).toArray(); |
| 64 | 64 |
} |
| 65 | 65 |
} |
| 66 |
else if (parentElement instanceof DerivedUnitBase){
|
|
| 66 |
else if (parentElement instanceof DerivedUnit){
|
|
| 67 | 67 |
try {
|
| 68 |
DerivedUnitFacade facade = DerivedUnitFacade.NewInstance((DerivedUnitBase) parentElement);
|
|
| 68 |
DerivedUnitFacade facade = DerivedUnitFacade.NewInstance((DerivedUnit) parentElement); |
|
| 69 | 69 |
|
| 70 | 70 |
// TODO at the moment we always create image galleries because the facade is like so. |
| 71 | 71 |
// this should definitely change and we want to use normal getters and setters here |
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/AddImageGalleryHandler.java | ||
|---|---|---|
| 7 | 7 |
import org.eclipse.core.commands.ExecutionEvent; |
| 8 | 8 |
import org.eclipse.core.commands.ExecutionException; |
| 9 | 9 |
import org.eclipse.core.commands.common.NotDefinedException; |
| 10 |
import org.eclipse.jface.viewers.ISelection; |
|
| 11 |
import org.eclipse.jface.viewers.IStructuredSelection; |
|
| 12 | 10 |
import org.eclipse.ui.IEditorInput; |
| 13 | 11 |
import org.eclipse.ui.IEditorPart; |
| 14 | 12 |
import org.eclipse.ui.IWorkbenchPart; |
| 15 | 13 |
import org.eclipse.ui.handlers.HandlerUtil; |
| 16 | 14 |
|
| 17 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; |
|
| 18 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException; |
|
| 19 |
import eu.etaxonomy.cdm.model.description.Feature; |
|
| 20 |
import eu.etaxonomy.cdm.model.description.SpecimenDescription; |
|
| 21 |
import eu.etaxonomy.cdm.model.description.TextData; |
|
| 22 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; |
|
| 23 | 15 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| 24 |
import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor; |
|
| 25 |
import eu.etaxonomy.taxeditor.bulkeditor.input.OccurrenceEditorInput; |
|
| 26 | 16 |
import eu.etaxonomy.taxeditor.editor.EditorUtil; |
| 27 | 17 |
import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; |
| 28 | 18 |
import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.CreateTaxonDescriptionOperation; |
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java | ||
|---|---|---|
| 15 | 15 |
import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; |
| 16 | 16 |
import org.eclipse.jface.viewers.StyledString; |
| 17 | 17 |
|
| 18 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
|
| 18 | 19 |
import eu.etaxonomy.cdm.model.common.Language; |
| 19 | 20 |
import eu.etaxonomy.cdm.model.common.LanguageString; |
| 20 | 21 |
import eu.etaxonomy.cdm.model.description.CategoricalData; |
| 21 | 22 |
import eu.etaxonomy.cdm.model.description.DescriptionBase; |
| 22 |
import eu.etaxonomy.cdm.model.description.Modifier; |
|
| 23 | 23 |
import eu.etaxonomy.cdm.model.description.StateData; |
| 24 | 24 |
import eu.etaxonomy.cdm.model.description.TextData; |
| 25 | 25 |
import eu.etaxonomy.taxeditor.model.FeatureNodeContainer; |
| ... | ... | |
| 76 | 76 |
text = text + UsageTermCollection.notAvailableLabel + ";" + UsageTermCollection.notAvailableLabel + ";"; |
| 77 | 77 |
} |
| 78 | 78 |
if (!((CategoricalData) element).getModifiers().isEmpty()) {
|
| 79 |
for (Modifier modifier: ((CategoricalData) element).getModifiers()){
|
|
| 79 |
for (DefinedTerm modifier: ((CategoricalData) element).getModifiers()){
|
|
| 80 | 80 |
modifier.getPartOf(); |
| 81 | 81 |
modifier.getVocabulary(); |
| 82 | 82 |
} |
| 83 | 83 |
|
| 84 | 84 |
boolean isPlantPartAbsent = true; |
| 85 |
for (Modifier modifier: ((CategoricalData) element).getModifiers()){
|
|
| 85 |
for (DefinedTerm modifier: ((CategoricalData) element).getModifiers()){
|
|
| 86 | 86 |
if(GetVocabularyType(modifier, UsageTermCollection.plantPartLabel)) {
|
| 87 | 87 |
text = text + modifier.getTitleCache()+ ";"; |
| 88 | 88 |
isPlantPartAbsent = false; |
| ... | ... | |
| 94 | 94 |
} |
| 95 | 95 |
|
| 96 | 96 |
boolean isHumanGroupAbsent = true; |
| 97 |
for (Modifier modifier: ((CategoricalData) element).getModifiers()){
|
|
| 97 |
for (DefinedTerm modifier: ((CategoricalData) element).getModifiers()){
|
|
| 98 | 98 |
if(GetVocabularyType(modifier, UsageTermCollection.humanGroupLabel)) {
|
| 99 | 99 |
text = text + modifier.getTitleCache()+ ";"; |
| 100 | 100 |
isHumanGroupAbsent = false; |
| ... | ... | |
| 105 | 105 |
} |
| 106 | 106 |
|
| 107 | 107 |
boolean isEthnicGroupAbsent = true; |
| 108 |
for (Modifier modifier: ((CategoricalData) element).getModifiers()){
|
|
| 108 |
for (DefinedTerm modifier: ((CategoricalData) element).getModifiers()){
|
|
| 109 | 109 |
if(GetVocabularyType(modifier, UsageTermCollection.ethnicGroupLabel)) {
|
| 110 | 110 |
text = text + modifier.getTitleCache()+ ";"; |
| 111 | 111 |
isEthnicGroupAbsent = false; |
| ... | ... | |
| 116 | 116 |
} |
| 117 | 117 |
|
| 118 | 118 |
boolean isCountryAbsent = true; |
| 119 |
for (Modifier modifier: ((CategoricalData) element).getModifiers()){
|
|
| 119 |
for (DefinedTerm modifier: ((CategoricalData) element).getModifiers()){
|
|
| 120 | 120 |
if(GetVocabularyType(modifier, UsageTermCollection.countryLabel)) {
|
| 121 | 121 |
text = text + modifier.getTitleCache()+ ";"; |
| 122 | 122 |
isCountryAbsent = false; |
| ... | ... | |
| 164 | 164 |
* @param vocabularyExpected |
| 165 | 165 |
* @return |
| 166 | 166 |
*/ |
| 167 |
private boolean GetVocabularyType(Modifier term, String vocabularyExpected) {
|
|
| 167 |
private boolean GetVocabularyType(DefinedTerm term, String vocabularyExpected) {
|
|
| 168 | 168 |
if ((term.getPartOf() != null) && (term.getPartOf().getTitleCache().equals(vocabularyExpected))) {
|
| 169 | 169 |
return true; |
| 170 | 170 |
} |
| eu.etaxonomy.taxeditor.help/html/gettingstarted/creating_multiple_datasources.html | ||
|---|---|---|
| 34 | 34 |
The <strong>"Enter credentials for embedded H2 database"</strong> pop-up box will open. |
| 35 | 35 |
</li> |
| 36 | 36 |
<li>Enter a Database name (for example the name of a user or a taxonomic group).</li> |
| 37 |
<li>Select <strong>ICBN</strong> or <strong>ICZN</strong> as appropriate.</li>
|
|
| 37 |
<li>Select <strong>ICNAFP</strong> or <strong>ICZN</strong> as appropriate.</li>
|
|
| 38 | 38 |
<li>Click <strong>Finish</strong>.</li> |
| 39 | 39 |
<p><img src="../img/2_10f.jpg" alt="" /></p> |
| 40 | 40 |
</ol> |
| ... | ... | |
| 45 | 45 |
<p>The new Datasource will appear in the Datasource panel: <p><img src="../img/2_10g.jpg" alt="" /></p></p> |
| 46 | 46 |
|
| 47 | 47 |
<p>The process to create new datasources can be repeated as many times as desired.</p> |
| 48 |
|
|
| 48 |
|
|
| eu.etaxonomy.taxeditor.help/html/gettingstarted/show_hide_options_of_drop-down_menus.html | ||
|---|---|---|
| 25 | 25 |
<li><strong>Matching:</strong> Experimental feature, not yet fully functional.</li> |
| 26 | 26 |
<li><strong>Taxonomic:</strong> Name Relationships Type: for example "misspelling for", "basionym for".</li> |
| 27 | 27 |
<li><strong>Name Type Designation Status:</strong> for example "monotypy", "present designation"</li> |
| 28 |
<li><strong>Nomenclatural Code:</strong> ICBN or ICZN.</li>
|
|
| 28 |
<li><strong>Nomenclatural Code:</strong> ICNAFP or ICZN.</li>
|
|
| 29 | 29 |
<li><strong>Nomenclatural Status Type:</strong> for example "invalid", "conserved".</li> |
| 30 | 30 |
<li><strong>Ranks:</strong> for example "cultivar", "tribe".</li> |
| 31 | 31 |
<li><strong>Specimen Type Designation Status:</strong> for example "epitype", "holotype".</li> |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/DefinedTermEditorInputFactory.java | ||
|---|---|---|
| 11 | 11 |
|
| 12 | 12 |
import org.eclipse.ui.IEditorInput; |
| 13 | 13 |
|
| 14 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
|
| 14 | 15 |
import eu.etaxonomy.cdm.model.common.DefinedTermBase; |
| 15 | 16 |
import eu.etaxonomy.cdm.model.common.ExtensionType; |
| 16 | 17 |
import eu.etaxonomy.cdm.model.common.MarkerType; |
| 17 | 18 |
import eu.etaxonomy.cdm.model.description.Feature; |
| 18 |
import eu.etaxonomy.cdm.model.description.Modifier; |
|
| 19 |
|
|
| 19 | 20 |
import eu.etaxonomy.cdm.model.description.State; |
| 20 | 21 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
| 21 | 22 |
import eu.etaxonomy.cdm.model.location.NamedAreaLevel; |
| ... | ... | |
| 52 | 53 |
if (clazz == State.class){
|
| 53 | 54 |
return new StateEditorInput(); |
| 54 | 55 |
} |
| 55 |
if (clazz == Modifier.class){
|
|
| 56 |
if (clazz == DefinedTerm.class){
|
|
| 56 | 57 |
return new ModifierEditorInput(); |
| 57 | 58 |
} |
| 58 | 59 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ModifierEditorInput.java | ||
|---|---|---|
| 12 | 12 |
import java.util.Arrays; |
| 13 | 13 |
import java.util.List; |
| 14 | 14 |
|
| 15 |
import eu.etaxonomy.cdm.model.description.Modifier; |
|
| 15 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
|
| 16 |
|
|
| 16 | 17 |
|
| 17 | 18 |
|
| 18 | 19 |
/** |
| ... | ... | |
| 20 | 21 |
* @date Jan 24, 2012 |
| 21 | 22 |
* |
| 22 | 23 |
*/ |
| 23 |
public class ModifierEditorInput extends AbstractDefinedTermEditorInput<Modifier> {
|
|
| 24 |
public class ModifierEditorInput extends AbstractDefinedTermEditorInput<DefinedTerm> {
|
|
| 24 | 25 |
|
| 25 | 26 |
private List<String> termClasses = Arrays.asList(new String[]{
|
| 26 |
Modifier.class.getName()
|
|
| 27 |
DefinedTerm.class.getName()
|
|
| 27 | 28 |
}); |
| 28 | 29 |
|
| 29 | 30 |
/* (non-Javadoc) |
| ... | ... | |
| 46 | 47 |
* @see eu.etaxonomy.taxeditor.editor.definedterm.input.AbstractDefinedTermEditorInput#createTermInstance() |
| 47 | 48 |
*/ |
| 48 | 49 |
@Override |
| 49 |
public Modifier createTermInstance() {
|
|
| 50 |
return Modifier.NewInstance();
|
|
| 50 |
public DefinedTerm createTermInstance() {
|
|
| 51 |
return DefinedTerm.NewInstance();
|
|
| 51 | 52 |
} |
| 52 | 53 |
|
| 53 | 54 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java | ||
|---|---|---|
| 19 | 19 |
import eu.etaxonomy.cdm.api.service.DefaultQuantitativeDescriptionBuilder; |
| 20 | 20 |
import eu.etaxonomy.cdm.api.service.DescriptionBuilder; |
| 21 | 21 |
import eu.etaxonomy.cdm.common.CdmUtils; |
| 22 |
import eu.etaxonomy.cdm.model.common.DescriptionElementSource;
|
|
| 22 |
import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
|
|
| 23 | 23 |
import eu.etaxonomy.cdm.model.common.IIdentifiableEntity; |
| 24 | 24 |
import eu.etaxonomy.cdm.model.common.ISourceable; |
| 25 | 25 |
import eu.etaxonomy.cdm.model.common.IdentifiableEntity; |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/NomenclaturalCodeHelper.java | ||
|---|---|---|
| 55 | 55 |
* @return |
| 56 | 56 |
*/ |
| 57 | 57 |
private static boolean isSupported(NomenclaturalCode code) {
|
| 58 |
if (code.equals(NomenclaturalCode.ICBN) || code.equals(NomenclaturalCode.ICZN)) {
|
|
| 58 |
if (code.equals(NomenclaturalCode.ICNAFP ) || code.equals(NomenclaturalCode.ICZN)) {
|
|
| 59 | 59 |
return true; |
| 60 | 60 |
} else {
|
| 61 | 61 |
return false; |
| ... | ... | |
| 73 | 73 |
if (code.equals(NomenclaturalCode.ICNB)) {
|
| 74 | 74 |
return "International Code of Nomenclature of Bacteria (ICNB)"; |
| 75 | 75 |
} |
| 76 |
if (code.equals(NomenclaturalCode.ICBN)) {
|
|
| 77 |
return "International Code of Botanical Nomenclature (ICBN)";
|
|
| 76 |
if (code.equals(NomenclaturalCode.ICNAFP )) {
|
|
| 77 |
return "International Code of Botanical Nomenclature (ICNAFP )";
|
|
| 78 | 78 |
} |
| 79 | 79 |
if (code.equals(NomenclaturalCode.ICNCP)) {
|
| 80 | 80 |
return "International Code of Cultivated Plants (ICNCP)"; |
| ... | ... | |
| 94 | 94 |
* @return a {@link eu.etaxonomy.cdm.model.name.NomenclaturalCode} object.
|
| 95 | 95 |
*/ |
| 96 | 96 |
public static NomenclaturalCode getDefaultCode() {
|
| 97 |
return NomenclaturalCode.ICBN;
|
|
| 97 |
return NomenclaturalCode.ICNAFP ;
|
|
| 98 | 98 |
} |
| 99 | 99 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java | ||
|---|---|---|
| 13 | 13 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; |
| 14 | 14 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException; |
| 15 | 15 |
import eu.etaxonomy.cdm.api.service.IOccurrenceService; |
| 16 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; |
|
| 17 |
import eu.etaxonomy.cdm.model.occurrence.Specimen; |
|
| 16 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
|
| 18 | 17 |
import eu.etaxonomy.taxeditor.preference.PreferencesUtil; |
| 19 | 18 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
| 20 | 19 |
import eu.etaxonomy.taxeditor.ui.section.occurrence.DerivedUnitBaseWizardPage; |
| ... | ... | |
| 29 | 28 |
* @created Jun 16, 2010 |
| 30 | 29 |
* @version 1.0 |
| 31 | 30 |
*/ |
| 32 |
public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard<DerivedUnitBase> {
|
|
| 31 |
public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard<DerivedUnit> {
|
|
| 33 | 32 |
|
| 34 | 33 |
/** {@inheritDoc} */
|
| 35 | 34 |
@Override |
| ... | ... | |
| 57 | 56 |
*/ |
| 58 | 57 |
/** {@inheritDoc} */
|
| 59 | 58 |
@Override |
| 60 |
protected DerivedUnitBase createNewEntity() {
|
|
| 59 |
protected DerivedUnit createNewEntity() {
|
|
| 61 | 60 |
// TODO we do want to create different derivates of DerivedUnitBase but go with specimen for testing |
| 62 | 61 |
// at the moment |
| 63 | 62 |
// FIXME add wizard page that handles the selection of derived unit type |
| 64 |
return Specimen.NewInstance(); |
|
| 63 |
//FIXME:3.3MC |
|
| 64 |
return DerivedUnit.NewInstance(); |
|
| 65 | 65 |
} |
| 66 | 66 |
|
| 67 | 67 |
/* (non-Javadoc) |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewFieldObservationWizard.java | ||
|---|---|---|
| 11 | 11 |
package eu.etaxonomy.taxeditor.newWizard; |
| 12 | 12 |
|
| 13 | 13 |
import eu.etaxonomy.cdm.api.service.IOccurrenceService; |
| 14 |
import eu.etaxonomy.cdm.model.occurrence.FieldObservation;
|
|
| 14 |
import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
|
|
| 15 | 15 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
| 16 | 16 |
|
| 17 | 17 |
/** |
| ... | ... | |
| 21 | 21 |
* @created Jun 17, 2010 |
| 22 | 22 |
* @version 1.0 |
| 23 | 23 |
*/ |
| 24 |
public class NewFieldObservationWizard extends AbstractNewEntityWizard<FieldObservation> {
|
|
| 24 |
public class NewFieldObservationWizard extends AbstractNewEntityWizard<FieldUnit> {
|
|
| 25 | 25 |
|
| 26 | 26 |
/* (non-Javadoc) |
| 27 | 27 |
* @see eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard#createNewEntity() |
| 28 | 28 |
*/ |
| 29 | 29 |
/** {@inheritDoc} */
|
| 30 | 30 |
@Override |
| 31 |
protected FieldObservation createNewEntity() {
|
|
| 31 |
protected FieldUnit createNewEntity() {
|
|
| 32 | 32 |
return null; |
| 33 | 33 |
} |
| 34 | 34 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java | ||
|---|---|---|
| 38 | 38 |
@Override |
| 39 | 39 |
protected NonViralName createNewEntity() {
|
| 40 | 40 |
NomenclaturalCode code = PreferencesUtil.getPreferredNomenclaturalCode(); |
| 41 |
if(code.equals(NomenclaturalCode.ICBN)){
|
|
| 41 |
if(code.equals(NomenclaturalCode.ICNAFP )){
|
|
| 42 | 42 |
return BotanicalName.NewInstance(null); |
| 43 | 43 |
}else if(code.equals(NomenclaturalCode.ICZN)){
|
| 44 | 44 |
return ZoologicalName.NewInstance(null); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java | ||
|---|---|---|
| 11 | 11 |
package eu.etaxonomy.taxeditor.preference; |
| 12 | 12 |
|
| 13 | 13 |
import eu.etaxonomy.cdm.model.common.IDefinedTerm; |
| 14 |
import eu.etaxonomy.cdm.model.occurrence.FieldObservation; |
|
| 15 | 14 |
|
| 16 | 15 |
/** |
| 17 | 16 |
* <p>IPreferenceKeys interface.</p> |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java | ||
|---|---|---|
| 10 | 10 |
|
| 11 | 11 |
package eu.etaxonomy.taxeditor.preference.menu; |
| 12 | 12 |
|
| 13 |
import eu.etaxonomy.cdm.model.description.Stage; |
|
| 13 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
|
| 14 |
|
|
| 14 | 15 |
|
| 15 | 16 |
/** |
| 16 | 17 |
* <p>StageMenuPreferences class.</p> |
| ... | ... | |
| 19 | 20 |
* @created Jun 25, 2010 |
| 20 | 21 |
* @version 1.0 |
| 21 | 22 |
*/ |
| 22 |
public class StageMenuPreferences extends AbstractMenuPreferences<Stage> {
|
|
| 23 |
public class StageMenuPreferences extends AbstractMenuPreferences<DefinedTerm> {
|
|
| 23 | 24 |
|
| 24 | 25 |
/** |
| 25 | 26 |
* <p>Constructor for StageMenuPreferences.</p> |
| ... | ... | |
| 35 | 36 |
*/ |
| 36 | 37 |
/** {@inheritDoc} */
|
| 37 | 38 |
@Override |
| 38 |
protected Class<Stage> getTermClass() {
|
|
| 39 |
return Stage.class;
|
|
| 39 |
protected Class<DefinedTerm> getTermClass() {
|
|
| 40 |
return DefinedTerm.class;
|
|
| 40 | 41 |
} |
| 41 | 42 |
|
| 42 | 43 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java | ||
|---|---|---|
| 34 | 34 |
import eu.etaxonomy.cdm.model.common.UuidAndTitleCache; |
| 35 | 35 |
import eu.etaxonomy.cdm.model.name.NameRelationship; |
| 36 | 36 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 37 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
|
|
| 37 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
|
| 38 | 38 |
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; |
| 39 | 39 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 40 | 40 |
import eu.etaxonomy.cdm.model.taxon.TaxonBase; |
| ... | ... | |
| 150 | 150 |
// by default we do not show field observations. This may be configured via preferences |
| 151 | 151 |
boolean showFieldObservations = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.BULK_EDITOR_OCCURRENCE_SHOW_FIELD_OBSERVATIONS); |
| 152 | 152 |
if(! showFieldObservations){
|
| 153 |
configurator.setClazz(DerivedUnitBase.class);
|
|
| 153 |
configurator.setClazz(DerivedUnit.class); |
|
| 154 | 154 |
} |
| 155 | 155 |
if(checkLargeResult(CdmStore.getService(IOccurrenceService.class).countByTitle(configurator))){
|
| 156 | 156 |
return CdmStore.getService(IOccurrenceService.class).findByTitle(configurator).getRecords(); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java | ||
|---|---|---|
| 17 | 17 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
| 18 | 18 |
import eu.etaxonomy.cdm.api.service.IOccurrenceService; |
| 19 | 19 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 20 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
|
|
| 20 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
|
| 21 | 21 |
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; |
| 22 | 22 |
import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard; |
| 23 | 23 |
import eu.etaxonomy.taxeditor.newWizard.NewDerivedUnitBaseWizard; |
| ... | ... | |
| 32 | 32 |
* @version 1.0 |
| 33 | 33 |
*/ |
| 34 | 34 |
public class DerivedUnitSelectionDialog extends |
| 35 |
AbstractFilteredCdmResourceSelectionDialog<DerivedUnitBase> {
|
|
| 35 |
AbstractFilteredCdmResourceSelectionDialog<DerivedUnit> {
|
|
| 36 | 36 |
|
| 37 | 37 |
/** |
| 38 | 38 |
* <p>select</p> |
| ... | ... | |
| 42 | 42 |
* @param unit a {@link eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase} object.
|
| 43 | 43 |
* @return a {@link eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase} object.
|
| 44 | 44 |
*/ |
| 45 |
public static DerivedUnitBase select(Shell shell, ConversationHolder conversation, DerivedUnitBase unit){
|
|
| 45 |
public static DerivedUnit select(Shell shell, ConversationHolder conversation, DerivedUnit unit){
|
|
| 46 | 46 |
DerivedUnitSelectionDialog dialog = new DerivedUnitSelectionDialog(shell, conversation, |
| 47 | 47 |
"Choose Unit", false, DerivedUnitSelectionDialog.class.getCanonicalName(), unit); |
| 48 | 48 |
return getSelectionFromDialog(dialog); |
| ... | ... | |
| 59 | 59 |
* @param cdmObject a {@link eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase} object.
|
| 60 | 60 |
*/ |
| 61 | 61 |
protected DerivedUnitSelectionDialog(Shell shell, ConversationHolder conversation, String title, |
| 62 |
boolean multi, String settings, DerivedUnitBase cdmObject) {
|
|
| 62 |
boolean multi, String settings, DerivedUnit cdmObject) {
|
|
| 63 | 63 |
super(shell, conversation, title, multi, settings, cdmObject); |
| 64 | 64 |
} |
| 65 | 65 |
|
| 66 | 66 |
/** {@inheritDoc} */
|
| 67 | 67 |
@Override |
| 68 |
protected DerivedUnitBase getPersistentObject(UUID uuid) {
|
|
| 68 |
protected DerivedUnit getPersistentObject(UUID uuid) {
|
|
| 69 | 69 |
Object object = CdmStore.getService(IOccurrenceService.class).load(uuid); |
| 70 | 70 |
|
| 71 | 71 |
SpecimenOrObservationBase specimenObservationBase = (SpecimenOrObservationBase) HibernateProxyHelper.deproxy(object); |
| 72 | 72 |
|
| 73 |
if(specimenObservationBase instanceof DerivedUnitBase){
|
|
| 74 |
return (DerivedUnitBase) specimenObservationBase;
|
|
| 73 |
if(specimenObservationBase instanceof DerivedUnit){
|
|
| 74 |
return (DerivedUnit) specimenObservationBase; |
|
| 75 | 75 |
} |
| 76 | 76 |
StoreUtil.error(this.getClass(), "Selected unit is not a derived unit", null); |
| 77 | 77 |
return null; |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldObservationSelectionDialog.java | ||
|---|---|---|
| 17 | 17 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
| 18 | 18 |
import eu.etaxonomy.cdm.api.service.IOccurrenceService; |
| 19 | 19 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 20 |
import eu.etaxonomy.cdm.model.occurrence.FieldObservation;
|
|
| 20 |
import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
|
|
| 21 | 21 |
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; |
| 22 | 22 |
import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard; |
| 23 | 23 |
import eu.etaxonomy.taxeditor.newWizard.NewFieldObservationWizard; |
| ... | ... | |
| 32 | 32 |
* @version 1.0 |
| 33 | 33 |
*/ |
| 34 | 34 |
public class FieldObservationSelectionDialog extends |
| 35 |
AbstractFilteredCdmResourceSelectionDialog<FieldObservation> {
|
|
| 35 |
AbstractFilteredCdmResourceSelectionDialog<FieldUnit> {
|
|
| 36 | 36 |
|
| 37 | 37 |
/** |
| 38 | 38 |
* <p>select</p> |
| 39 | 39 |
* |
| 40 | 40 |
* @param shell a {@link org.eclipse.swt.widgets.Shell} object.
|
| 41 | 41 |
* @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
|
| 42 |
* @param observation a {@link eu.etaxonomy.cdm.model.occurrence.FieldObservation} object.
|
|
| 43 |
* @return a {@link eu.etaxonomy.cdm.model.occurrence.FieldObservation} object.
|
|
| 42 |
* @param observation a {@link eu.etaxonomy.cdm.model.occurrence.FieldUnit} object.
|
|
| 43 |
* @return a {@link eu.etaxonomy.cdm.model.occurrence.FieldUnit} object.
|
|
| 44 | 44 |
*/ |
| 45 |
public static FieldObservation select(Shell shell, ConversationHolder conversation, FieldObservation observation){
|
|
| 45 |
public static FieldUnit select(Shell shell, ConversationHolder conversation, FieldUnit observation){
|
|
| 46 | 46 |
FieldObservationSelectionDialog dialog = new FieldObservationSelectionDialog(shell, conversation, |
| 47 | 47 |
"Choose Derived Unit", false, FieldObservationSelectionDialog.class.getCanonicalName(), observation); |
| 48 | 48 |
return getSelectionFromDialog(dialog); |
| ... | ... | |
| 60 | 60 |
*/ |
| 61 | 61 |
protected FieldObservationSelectionDialog(Shell shell, ConversationHolder conversation, |
| 62 | 62 |
String title, boolean multi, String settings, |
| 63 |
FieldObservation cdmObject) {
|
|
| 63 |
FieldUnit cdmObject) {
|
|
| 64 | 64 |
super(shell, conversation, title, multi, settings, cdmObject); |
| 65 | 65 |
} |
| 66 | 66 |
|
| ... | ... | |
| 69 | 69 |
*/ |
| 70 | 70 |
/** {@inheritDoc} */
|
| 71 | 71 |
@Override |
| 72 |
protected FieldObservation getPersistentObject(UUID uuid) {
|
|
| 72 |
protected FieldUnit getPersistentObject(UUID uuid) {
|
|
| 73 | 73 |
Object object = CdmStore.getService(IOccurrenceService.class).load(uuid); |
| 74 | 74 |
|
| 75 | 75 |
SpecimenOrObservationBase specimenObservationBase = (SpecimenOrObservationBase) HibernateProxyHelper.deproxy(object); |
| 76 | 76 |
|
| 77 |
if(specimenObservationBase instanceof FieldObservation){
|
|
| 78 |
return (FieldObservation) specimenObservationBase;
|
|
| 77 |
if(specimenObservationBase instanceof FieldUnit){
|
|
| 78 |
return (FieldUnit) specimenObservationBase;
|
|
| 79 | 79 |
} |
| 80 | 80 |
StoreUtil.error(this.getClass(), "Selected object is not a field observation", null); |
| 81 | 81 |
return null; |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java | ||
|---|---|---|
| 27 | 27 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
| 28 | 28 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 29 | 29 |
import eu.etaxonomy.cdm.model.occurrence.Collection; |
| 30 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
|
|
| 31 |
import eu.etaxonomy.cdm.model.occurrence.FieldObservation;
|
|
| 30 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
|
| 31 |
import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
|
|
| 32 | 32 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 33 | 33 |
import eu.etaxonomy.cdm.model.taxon.Classification; |
| 34 | 34 |
import eu.etaxonomy.cdm.model.taxon.Synonym; |
| ... | ... | |
| 87 | 87 |
"This functionality is not implemented yet."); |
| 88 | 88 |
return null; |
| 89 | 89 |
} |
| 90 |
if(clazz.equals(DerivedUnitBase.class)){
|
|
| 91 |
return (T) DerivedUnitSelectionDialog.select(shell, conversation, (DerivedUnitBase) curentSelection);
|
|
| 90 |
if(clazz.equals(DerivedUnit.class)){
|
|
| 91 |
return (T) DerivedUnitSelectionDialog.select(shell, conversation, (DerivedUnit) curentSelection); |
|
| 92 | 92 |
} |
| 93 |
if(clazz.equals(FieldObservation.class)){
|
|
| 94 |
return (T) FieldObservationSelectionDialog.select(shell, conversation, (FieldObservation) curentSelection);
|
|
| 93 |
if(clazz.equals(FieldUnit.class)){
|
|
| 94 |
return (T) FieldObservationSelectionDialog.select(shell, conversation, (FieldUnit) curentSelection);
|
|
| 95 | 95 |
} |
| 96 | 96 |
if(clazz.equals(NamedArea.class)){
|
| 97 | 97 |
return (T) NamedAreaSelectionDialog.select(shell, conversation, (NamedArea) curentSelection); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java | ||
|---|---|---|
| 46 | 46 |
import eu.etaxonomy.cdm.model.common.Annotation; |
| 47 | 47 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 48 | 48 |
import eu.etaxonomy.cdm.model.common.Credit; |
| 49 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
|
| 49 | 50 |
import eu.etaxonomy.cdm.model.common.DefinedTermBase; |
| 50 |
import eu.etaxonomy.cdm.model.common.DescriptionElementSource;
|
|
| 51 |
import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
|
|
| 51 | 52 |
import eu.etaxonomy.cdm.model.common.Extension; |
| 52 | 53 |
import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl; |
| 53 | 54 |
import eu.etaxonomy.cdm.model.common.Group; |
| ... | ... | |
| 67 | 68 |
import eu.etaxonomy.cdm.model.description.Feature; |
| 68 | 69 |
import eu.etaxonomy.cdm.model.description.IndividualsAssociation; |
| 69 | 70 |
import eu.etaxonomy.cdm.model.description.KeyStatement; |
| 70 |
import eu.etaxonomy.cdm.model.description.Modifier; |
|
| 71 | 71 |
import eu.etaxonomy.cdm.model.description.QuantitativeData; |
| 72 |
import eu.etaxonomy.cdm.model.description.Scope; |
|
| 73 | 72 |
import eu.etaxonomy.cdm.model.description.StateData; |
| 74 | 73 |
import eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue; |
| 75 | 74 |
import eu.etaxonomy.cdm.model.description.TaxonInteraction; |
| ... | ... | |
| 88 | 87 |
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation; |
| 89 | 88 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
| 90 | 89 |
import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent; |
| 91 |
import eu.etaxonomy.cdm.model.occurrence.Specimen; |
|
| 92 | 90 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 93 | 91 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| 94 | 92 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
| ... | ... | |
| 2048 | 2046 |
} else if (entity instanceof IdentifiableSource) {
|
| 2049 | 2047 |
element = new IdentifiableSourceElement(this, parentElement, |
| 2050 | 2048 |
(IdentifiableSource) entity, removeListener, style); |
| 2051 |
} else if (entity instanceof Scope) {
|
|
| 2052 |
element = new ScopeElement(this, parentElement, (Scope) entity, |
|
| 2049 |
} else if (entity instanceof DefinedTerm) {
|
|
| 2050 |
//FIXME:3.3MC |
|
| 2051 |
element = new ScopeElement(this, parentElement, (DefinedTerm) entity, |
|
| 2053 | 2052 |
removeListener, style); |
| 2054 |
} else if (entity instanceof Modifier) {
|
|
| 2053 |
} else if (entity instanceof DefinedTerm) {
|
|
| 2055 | 2054 |
element = new ModifierElement(this, parentElement, |
| 2056 |
(Modifier) entity, removeListener, style);
|
|
| 2055 |
(DefinedTerm) entity, removeListener, style);
|
|
| 2057 | 2056 |
} else if (entity instanceof Reference) {
|
| 2058 | 2057 |
element = new DescriptionSourceElement(this, parentElement, |
| 2059 | 2058 |
(Reference) entity, removeListener, style); |
| ... | ... | |
| 2074 | 2073 |
parentElement, (StatisticalMeasurementValue) entity, |
| 2075 | 2074 |
removeListener, style); |
| 2076 | 2075 |
} else if (entity instanceof DerivedUnit) {
|
| 2076 |
//FIXME:3.3MC |
|
| 2077 | 2077 |
element = new DerivedUnitElement(this, parentElement, |
| 2078 | 2078 |
(DerivedUnit) entity, removeListener, style); |
| 2079 | 2079 |
} else if (entity instanceof NamedArea) {
|
| ... | ... | |
| 2081 | 2081 |
(NamedArea) entity, removeListener, style); |
| 2082 | 2082 |
} else if (entity instanceof DeterminationEvent) {
|
| 2083 | 2083 |
element = new DeterminationEventDetailElement(this, parentElement, |
| 2084 |
(DeterminationEvent) entity, removeListener, style); |
|
| 2085 |
} else if (entity instanceof Specimen) {
|
|
| 2084 |
(DeterminationEvent) entity, removeListener, style); |
|
| 2085 |
} else if (entity instanceof DerivedUnit) {
|
|
| 2086 |
//FIXME:3.3MC |
|
| 2086 | 2087 |
element = new SpecimenCollectionDetailElement(this, parentElement, |
| 2087 |
(Specimen) entity, removeListener, style);
|
|
| 2088 |
(DerivedUnit) entity, removeListener, style);
|
|
| 2088 | 2089 |
} else if (entity instanceof User) {
|
| 2089 | 2090 |
element = new MemberDetailElement(this, parentElement, |
| 2090 | 2091 |
(User) entity, removeListener, style); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DerivedUnitElement.java | ||
|---|---|---|
| 12 | 12 |
|
| 13 | 13 |
import org.eclipse.swt.events.SelectionListener; |
| 14 | 14 |
|
| 15 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
|
|
| 15 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
|
| 16 | 16 |
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; |
| 17 | 17 |
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; |
| 18 | 18 |
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; |
| ... | ... | |
| 32 | 32 |
public class DerivedUnitElement extends |
| 33 | 33 |
AbstractEntityCollectionElement<SpecimenOrObservationBase> {
|
| 34 | 34 |
|
| 35 |
private EntitySelectionElement<DerivedUnitBase> selection_derivedUnit;
|
|
| 35 |
private EntitySelectionElement<DerivedUnit> selection_derivedUnit; |
|
| 36 | 36 |
|
| 37 | 37 |
/** |
| 38 | 38 |
* <p> |
| ... | ... | |
| 71 | 71 |
@Override |
| 72 | 72 |
public void createControls(ICdmFormElement element, int style) {
|
| 73 | 73 |
selection_derivedUnit = formFactory.createSelectionElement( |
| 74 |
DerivedUnitBase.class, getConversationHolder(), element,
|
|
| 74 |
DerivedUnit.class, getConversationHolder(), element, |
|
| 75 | 75 |
"Specimen", null, EntitySelectionElement.SELECTABLE | EntitySelectionElement.EDITABLE, |
| 76 | 76 |
style); |
| 77 | 77 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescribedSpecimenSection.java | ||
|---|---|---|
| 14 | 14 |
|
| 15 | 15 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
| 16 | 16 |
import eu.etaxonomy.cdm.model.description.TaxonDescription; |
| 17 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
|
|
| 17 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
|
| 18 | 18 |
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; |
| 19 | 19 |
import eu.etaxonomy.taxeditor.ui.dialog.selection.DerivedUnitSelectionDialog; |
| 20 | 20 |
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; |
| ... | ... | |
| 54 | 54 |
/** {@inheritDoc} */
|
| 55 | 55 |
@Override |
| 56 | 56 |
public SpecimenOrObservationBase createNewElement() {
|
| 57 |
DerivedUnitBase selection = DerivedUnitSelectionDialog.select(getShell(), getConversationHolder(), null);
|
|
| 57 |
DerivedUnit selection = DerivedUnitSelectionDialog.select(getShell(), getConversationHolder(), null); |
|
| 58 | 58 |
return selection; |
| 59 | 59 |
} |
| 60 | 60 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceElement.java | ||
|---|---|---|
| 13 | 13 |
import org.eclipse.swt.SWT; |
| 14 | 14 |
import org.eclipse.swt.events.SelectionListener; |
| 15 | 15 |
|
| 16 |
import eu.etaxonomy.cdm.model.common.DescriptionElementSource;
|
|
| 16 |
import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
|
|
| 17 | 17 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 18 | 18 |
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; |
| 19 | 19 |
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceSection.java | ||
|---|---|---|
| 7 | 7 |
|
| 8 | 8 |
|
| 9 | 9 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
| 10 |
import eu.etaxonomy.cdm.model.common.DescriptionElementSource;
|
|
| 10 |
import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
|
|
| 11 | 11 |
import eu.etaxonomy.cdm.model.description.DescriptionElementBase; |
| 12 | 12 |
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; |
| 13 | 13 |
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java | ||
|---|---|---|
| 12 | 12 |
|
| 13 | 13 |
import org.eclipse.swt.events.SelectionListener; |
| 14 | 14 |
|
| 15 |
import eu.etaxonomy.cdm.model.description.Modifier; |
|
| 15 |
|
|
| 16 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
|
| 16 | 17 |
import eu.etaxonomy.taxeditor.ui.combo.TermComboElement; |
| 17 | 18 |
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; |
| 18 | 19 |
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; |
| ... | ... | |
| 26 | 27 |
* @created Sep 15, 2010 |
| 27 | 28 |
* @version 1.0 |
| 28 | 29 |
*/ |
| 29 |
public class ModifierElement extends AbstractEntityCollectionElement<Modifier> {
|
|
| 30 |
public class ModifierElement extends AbstractEntityCollectionElement<DefinedTerm> {
|
|
| 30 | 31 |
|
| 31 |
private TermComboElement<Modifier> combo_modifier;
|
|
| 32 |
private TermComboElement<DefinedTerm> combo_modifier;
|
|
| 32 | 33 |
|
| 33 | 34 |
/** |
| 34 | 35 |
* <p>Constructor for ModifierElement.</p> |
| ... | ... | |
| 40 | 41 |
* @param style a int. |
| 41 | 42 |
*/ |
| 42 | 43 |
public ModifierElement(CdmFormFactory formFactory, |
| 43 |
AbstractFormSection section, Modifier entity,
|
|
| 44 |
AbstractFormSection section, DefinedTerm entity,
|
|
| 44 | 45 |
SelectionListener removeListener, int style) {
|
| 45 | 46 |
super(formFactory, section, entity, removeListener, null, style); |
| 46 | 47 |
} |
| 47 | 48 |
|
| 48 | 49 |
/** {@inheritDoc} */
|
| 49 | 50 |
@Override |
| 50 |
public void setEntity(Modifier entity) {
|
|
| 51 |
public void setEntity(DefinedTerm entity) {
|
|
| 51 | 52 |
this.entity = entity; |
| 52 | 53 |
combo_modifier.setSelection(entity); |
| 53 | 54 |
} |
| ... | ... | |
| 55 | 56 |
/** {@inheritDoc} */
|
| 56 | 57 |
@Override |
| 57 | 58 |
public void createControls(ICdmFormElement element, int style) {
|
| 58 |
combo_modifier = formFactory.createTermComboElement(Modifier.class, element, "Modifier", getEntity(), style);
|
|
| 59 |
combo_modifier = formFactory.createTermComboElement(DefinedTerm.class, element, "Modifier", getEntity(), style);
|
|
| 59 | 60 |
} |
| 60 | 61 |
|
| 61 | 62 |
/** {@inheritDoc} */
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierSection.java | ||
|---|---|---|
| 13 | 13 |
import java.util.Collection; |
| 14 | 14 |
|
| 15 | 15 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
| 16 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
|
| 16 | 17 |
import eu.etaxonomy.cdm.model.description.IModifiable; |
| 17 |
import eu.etaxonomy.cdm.model.description.Modifier; |
|
| 18 | 18 |
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; |
| 19 | 19 |
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; |
| 20 | 20 |
import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection; |
| ... | ... | |
| 26 | 26 |
* @created Sep 15, 2010 |
| 27 | 27 |
* @version 1.0 |
| 28 | 28 |
*/ |
| 29 |
public class ModifierSection extends AbstractEntityCollectionSection<IModifiable, Modifier> {
|
|
| 29 |
public class ModifierSection extends AbstractEntityCollectionSection<IModifiable, DefinedTerm> {
|
|
| 30 | 30 |
|
| 31 | 31 |
/** |
| 32 | 32 |
* <p>Constructor for ModifierSection.</p> |
| ... | ... | |
| 44 | 44 |
|
| 45 | 45 |
/** {@inheritDoc} */
|
| 46 | 46 |
@Override |
| 47 |
public Collection<Modifier> getCollection(IModifiable entity) {
|
|
| 47 |
public Collection<DefinedTerm> getCollection(IModifiable entity) {
|
|
| 48 | 48 |
return entity.getModifiers(); |
| 49 | 49 |
} |
| 50 | 50 |
|
| 51 | 51 |
/** {@inheritDoc} */
|
| 52 | 52 |
@Override |
| 53 |
public Modifier createNewElement() {
|
|
| 54 |
return Modifier.NewInstance();
|
|
| 53 |
public DefinedTerm createNewElement() {
|
|
| 54 |
return DefinedTerm.NewInstance();
|
|
| 55 | 55 |
} |
| 56 | 56 |
|
| 57 | 57 |
/** {@inheritDoc} */
|
| 58 | 58 |
@Override |
| 59 |
public void addElement(Modifier element) {
|
|
| 59 |
public void addElement(DefinedTerm element) {
|
|
| 60 | 60 |
getEntity().addModifier(element); |
| 61 | 61 |
} |
| 62 | 62 |
|
| 63 | 63 |
/** {@inheritDoc} */
|
| 64 | 64 |
@Override |
| 65 |
public void removeElement(Modifier element) {
|
|
| 65 |
public void removeElement(DefinedTerm element) {
|
|
| 66 | 66 |
getEntity().removeModifier(element); |
| 67 | 67 |
} |
| 68 | 68 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java | ||
|---|---|---|
| 12 | 12 |
|
| 13 | 13 |
import org.eclipse.swt.events.SelectionListener; |
| 14 | 14 |
|
| 15 |
import eu.etaxonomy.cdm.model.description.Scope;
|
|
| 15 |
import eu.etaxonomy.cdm.model.common.DefinedTerm;
|
|
| 16 | 16 |
import eu.etaxonomy.taxeditor.ui.combo.TermComboElement; |
| 17 | 17 |
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; |
| 18 | 18 |
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; |
| ... | ... | |
| 26 | 26 |
* @created Mar 18, 2010 |
| 27 | 27 |
* @version 1.0 |
| 28 | 28 |
*/ |
| 29 |
public class ScopeElement extends AbstractEntityCollectionElement<Scope> {
|
|
| 29 |
public class ScopeElement extends AbstractEntityCollectionElement<DefinedTerm> {
|
|
| 30 | 30 |
|
| 31 |
private TermComboElement<Scope> combo_scope;
|
|
| 31 |
private TermComboElement<DefinedTerm> combo_scope;
|
|
| 32 | 32 |
|
| 33 | 33 |
/** |
| 34 | 34 |
* <p>Constructor for ScopeElement.</p> |
| ... | ... | |
| 40 | 40 |
* @param style a int. |
| 41 | 41 |
*/ |
| 42 | 42 |
public ScopeElement(CdmFormFactory cdmFormFactory, |
| 43 |
AbstractFormSection section, Scope element,
|
|
| 43 |
AbstractFormSection section, DefinedTerm element,
|
|
| 44 | 44 |
SelectionListener removeListener, int style) {
|
| 45 | 45 |
super(cdmFormFactory, section, element, removeListener, null, style); |
| 46 | 46 |
} |
| 47 | 47 |
|
| 48 | 48 |
/** {@inheritDoc} */
|
| 49 | 49 |
@Override |
| 50 |
public void setEntity(Scope entity) {
|
|
| 50 |
public void setEntity(DefinedTerm entity) {
|
|
| 51 | 51 |
this.entity = entity; |
| 52 | 52 |
combo_scope.setSelection(entity); |
| 53 | 53 |
} |
| ... | ... | |
| 55 | 55 |
/** {@inheritDoc} */
|
| 56 | 56 |
@Override |
| 57 | 57 |
public void createControls(ICdmFormElement element, int style) {
|
| 58 |
combo_scope = formFactory.createTermComboElement(Scope.class, element, "Scope", null, style);
|
|
| 58 |
combo_scope = formFactory.createTermComboElement(DefinedTerm.class, element, "Scope", null, style);
|
|
| 59 | 59 |
} |
| 60 | 60 |
|
| 61 | 61 |
/** {@inheritDoc} */
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeSection.java | ||
|---|---|---|
| 13 | 13 |
import java.util.Collection; |
| 14 | 14 |
|
| 15 | 15 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
| 16 |
import eu.etaxonomy.cdm.model.description.Scope;
|
|
| 16 |
import eu.etaxonomy.cdm.model.common.DefinedTerm;
|
|
| 17 | 17 |
import eu.etaxonomy.cdm.model.description.TaxonDescription; |
| 18 | 18 |
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; |
| 19 | 19 |
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; |
| ... | ... | |
| 26 | 26 |
* @created Mar 18, 2010 |
| 27 | 27 |
* @version 1.0 |
| 28 | 28 |
*/ |
| 29 |
public class ScopeSection extends AbstractEntityCollectionSection<TaxonDescription, Scope> {
|
|
| 29 |
public class ScopeSection extends AbstractEntityCollectionSection<TaxonDescription, DefinedTerm> {
|
|
| 30 | 30 |
|
| 31 | 31 |
/** |
| 32 | 32 |
* <p>Constructor for ScopeSection.</p> |
| ... | ... | |
| 42 | 42 |
|
| 43 | 43 |
/** {@inheritDoc} */
|
| 44 | 44 |
@Override |
| 45 |
public void addElement(Scope element) {
|
|
| 45 |
public void addElement(DefinedTerm element) {
|
|
| 46 | 46 |
getEntity().addScope(element); |
| 47 | 47 |
} |
| 48 | 48 |
|
| 49 | 49 |
/** {@inheritDoc} */
|
| 50 | 50 |
@Override |
| 51 |
public Scope createNewElement() {
|
|
| 52 |
return Scope.NewInstance();
|
|
| 51 |
public DefinedTerm createNewElement() {
|
|
| 52 |
return DefinedTerm.NewInstance();
|
|
| 53 | 53 |
} |
| 54 | 54 |
|
| 55 | 55 |
/** {@inheritDoc} */
|
| 56 | 56 |
@Override |
| 57 |
public Collection<Scope> getCollection(TaxonDescription entity) {
|
|
| 57 |
public Collection<DefinedTerm> getCollection(TaxonDescription entity) {
|
|
| 58 | 58 |
return entity.getScopes(); |
| 59 | 59 |
} |
| 60 | 60 |
|
| ... | ... | |
| 72 | 72 |
|
| 73 | 73 |
/** {@inheritDoc} */
|
| 74 | 74 |
@Override |
| 75 |
public void removeElement(Scope element) {
|
|
| 75 |
public void removeElement(DefinedTerm element) {
|
|
| 76 | 76 |
getEntity().removeScope(element); |
| 77 | 77 |
} |
| 78 | 78 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java | ||
|---|---|---|
| 16 | 16 |
import eu.etaxonomy.cdm.model.common.Language; |
| 17 | 17 |
import eu.etaxonomy.cdm.model.common.LanguageString; |
| 18 | 18 |
import eu.etaxonomy.cdm.model.description.IndividualsAssociation; |
| 19 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
|
|
| 19 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
|
| 20 | 20 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
| 21 | 21 |
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; |
| 22 | 22 |
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; |
| ... | ... | |
| 36 | 36 |
AbstractDetailedDescriptionDetailElement<IndividualsAssociation> {
|
| 37 | 37 |
|
| 38 | 38 |
private TextWithLabelElement text_description; |
| 39 |
private EntitySelectionElement<DerivedUnitBase> selection_derivedUnit;
|
|
| 39 |
private EntitySelectionElement<DerivedUnit> selection_derivedUnit; |
|
| 40 | 40 |
|
| 41 | 41 |
/** |
| 42 | 42 |
* <p> |
| ... | ... | |
| 67 | 67 |
protected void createControls(ICdmFormElement formElement, |
| 68 | 68 |
IndividualsAssociation entity, int style) {
|
| 69 | 69 |
selection_derivedUnit = formFactory |
| 70 |
.createSelectionElement(DerivedUnitBase.class,
|
|
| 70 |
.createSelectionElement(DerivedUnit.class, |
|
| 71 | 71 |
getConversationHolder(), formElement, "Unit", |
| 72 |
CdmBase.deproxy(entity.getAssociatedSpecimenOrObservation(),DerivedUnitBase.class),
|
|
| 72 |
CdmBase.deproxy(entity.getAssociatedSpecimenOrObservation(),DerivedUnit.class), |
|
| 73 | 73 |
EntitySelectionElement.ALL, style); |
| 74 | 74 |
|
| 75 | 75 |
text_description = formFactory.createMultilineTextWithLabel( |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java | ||
|---|---|---|
| 6 | 6 |
import java.util.Collection; |
| 7 | 7 |
|
| 8 | 8 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
| 9 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
|
| 9 | 10 |
import eu.etaxonomy.cdm.model.description.PolytomousKey; |
| 10 |
import eu.etaxonomy.cdm.model.description.Scope; |
|
| 11 | 11 |
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; |
| 12 | 12 |
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; |
| 13 | 13 |
import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection; |
| ... | ... | |
| 16 | 16 |
* @author n.hoffmann |
| 17 | 17 |
* |
| 18 | 18 |
*/ |
| 19 |
public class ScopeRestrictionSection extends AbstractEntityCollectionSection<PolytomousKey, Scope> {
|
|
| 19 |
public class ScopeRestrictionSection extends AbstractEntityCollectionSection<PolytomousKey, DefinedTerm> {
|
|
| 20 | 20 |
|
| 21 | 21 |
public ScopeRestrictionSection(CdmFormFactory formFactory, |
| 22 | 22 |
ConversationHolder conversation, ICdmFormElement parentElement, int style) {
|
| ... | ... | |
| 24 | 24 |
} |
| 25 | 25 |
|
| 26 | 26 |
@Override |
| 27 |
public Collection<Scope> getCollection(PolytomousKey entity) {
|
|
| 27 |
public Collection<DefinedTerm> getCollection(PolytomousKey entity) {
|
|
| 28 | 28 |
return entity.getScopeRestrictions(); |
| 29 | 29 |
} |
| 30 | 30 |
|
| 31 | 31 |
@Override |
| 32 |
public Scope createNewElement() {
|
|
| 33 |
return Scope.NewInstance();
|
|
| 32 |
public DefinedTerm createNewElement() {
|
|
| 33 |
return DefinedTerm.NewInstance();
|
|
| 34 | 34 |
} |
| 35 | 35 |
|
| 36 | 36 |
@Override |
| 37 |
public void addElement(Scope element) {
|
|
| 37 |
public void addElement(DefinedTerm element) {
|
|
| 38 | 38 |
getEntity().addScopeRestriction(element); |
| 39 | 39 |
} |
| 40 | 40 |
|
| 41 | 41 |
@Override |
| 42 |
public void removeElement(Scope element) {
|
|
| 42 |
public void removeElement(DefinedTerm element) {
|
|
| 43 | 43 |
getEntity().removeScopeRestriction(element); |
| 44 | 44 |
} |
| 45 | 45 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java | ||
|---|---|---|
| 123 | 123 |
NomenclaturalCode code = nonViralName.getNomenclaturalCode(); |
| 124 | 124 |
if (code != null){
|
| 125 | 125 |
switch(nonViralName.getNomenclaturalCode()){
|
| 126 |
case ICBN:
|
|
| 126 |
case ICNAFP :
|
|
| 127 | 127 |
createBotanicalNameParts(formElement, nonViralName, style); |
| 128 | 128 |
break; |
| 129 | 129 |
case ICZN: |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java | ||
|---|---|---|
| 15 | 15 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 16 | 16 |
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation; |
| 17 | 17 |
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus; |
| 18 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; |
|
| 19 |
import eu.etaxonomy.cdm.model.occurrence.Specimen; |
|
| 18 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
|
| 20 | 19 |
import eu.etaxonomy.taxeditor.ui.combo.TermComboElement; |
| 21 | 20 |
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; |
| 22 | 21 |
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; |
| ... | ... | |
| 37 | 36 |
AbstractTypeDesignationElement<SpecimenTypeDesignation> {
|
| 38 | 37 |
|
| 39 | 38 |
private TermComboElement<SpecimenTypeDesignationStatus> combo_typeStatus; |
| 40 |
private EntitySelectionElement<DerivedUnitBase> selection_typeSpecimen;
|
|
| 39 |
private EntitySelectionElement<DerivedUnit> selection_typeSpecimen; |
|
| 41 | 40 |
private TextWithLabelElement text_specimenTypeText; |
| 42 | 41 |
|
| 43 | 42 |
/** |
| ... | ... | |
| 69 | 68 |
@Override |
| 70 | 69 |
public void createControls(ICdmFormElement formElement, int style) {
|
| 71 | 70 |
selection_typeSpecimen = formFactory |
| 72 |
.createSelectionElement(DerivedUnitBase.class,
|
|
| 71 |
.createSelectionElement(DerivedUnit.class, |
|
| 73 | 72 |
getConversationHolder(), formElement, "Specimen", null, |
| 74 | 73 |
EntitySelectionElement.ALL, style); |
| 75 | 74 |
combo_typeStatus = formFactory |
| ... | ... | |
| 102 | 101 |
// TODO this is a simple workaround to enter type specimen as text |
| 103 | 102 |
// strings |
| 104 | 103 |
if (getEntity().getTypeSpecimen() == null) {
|
| 105 |
Specimen typeSpecimen = Specimen.NewInstance();
|
|
| 104 |
DerivedUnit typeSpecimen = DerivedUnit.NewInstance();
|
|
| 106 | 105 |
getEntity().setTypeSpecimen(typeSpecimen); |
| 107 | 106 |
} |
| 108 | 107 |
getEntity().getTypeSpecimen().setTitleCache( |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java | ||
|---|---|---|
| 15 | 15 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; |
| 16 | 16 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeConfigurator; |
| 17 | 17 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException; |
| 18 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
|
|
| 18 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
|
| 19 | 19 |
import eu.etaxonomy.taxeditor.store.StoreUtil; |
| 20 | 20 |
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; |
| 21 | 21 |
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; |
| ... | ... | |
| 31 | 31 |
* @created Jun 17, 2010 |
| 32 | 32 |
* @version 1.0 |
| 33 | 33 |
*/ |
| 34 |
public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement<DerivedUnitBase> {
|
|
| 34 |
public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement<DerivedUnit> {
|
|
| 35 | 35 |
|
| 36 | 36 |
private DerivedUnitFacade facade; |
| 37 | 37 |
|
| ... | ... | |
| 58 | 58 |
|
| 59 | 59 |
/** {@inheritDoc} */
|
| 60 | 60 |
@Override |
| 61 |
public void setEntity(DerivedUnitBase entity) {
|
|
| 61 |
public void setEntity(DerivedUnit entity) {
|
|
| 62 | 62 |
super.setEntity(entity); |
| 63 | 63 |
try {
|
| 64 | 64 |
facade = DerivedUnitFacade.NewInstance(entity, configurator); |
| ... | ... | |
| 101 | 101 |
|
| 102 | 102 |
/** {@inheritDoc} */
|
| 103 | 103 |
@Override |
| 104 |
public DerivedUnitBase getEntity() {
|
|
| 104 |
public DerivedUnit getEntity() {
|
|
| 105 | 105 |
throw new IllegalArgumentException("Should not be called");
|
| 106 | 106 |
} |
| 107 | 107 |
|
| ... | ... | |
| 117 | 117 |
/** {@inheritDoc} */
|
| 118 | 118 |
@Override |
| 119 | 119 |
protected void createControls(ICdmFormElement formElement, |
| 120 |
DerivedUnitBase entity, int style) {
|
|
| 120 |
DerivedUnit entity, int style) {
|
|
| 121 | 121 |
|
| 122 | 122 |
section_general = (GeneralDetailSection) formFactory.createCdmDetailSection(DetailType.DERIVED_UNIT_GENERAL, getConversationHolder(), formElement, null, Section.TWISTIE | Section.EXPANDED); |
| 123 | 123 |
section_general.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailSection.java | ||
|---|---|---|
| 13 | 13 |
import org.eclipse.jface.viewers.ISelectionProvider; |
| 14 | 14 |
|
| 15 | 15 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
| 16 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
|
|
| 16 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
|
| 17 | 17 |
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; |
| 18 | 18 |
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; |
| 19 | 19 |
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; |
Also available in: Unified diff
Aligning Editor with 3.3 model changes. First phase commit which updates only the classes.
Branch not compilable at the moment.