From: Patric Plitzner Date: Mon, 21 Oct 2013 11:24:06 +0000 (+0000) Subject: - added not covered switch cases in NameDetailElement X-Git-Tag: 3.6.0~937 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/5a35a97d2967c30a54322ef037baee7e891113ff - added not covered switch cases in NameDetailElement - commented null pointer access in UseObjectManager (FIXME 3.3M) --- diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java index a12ebd3bf..5ede554fc 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java @@ -1,8 +1,8 @@ /** * Copyright (C) 2011 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * The contents of this file are subject to the Mozilla Public License Version 1.1 * See LICENSE.TXT at the top of this package for the full license terms. */ @@ -31,58 +31,58 @@ import eu.etaxonomy.taxeditor.store.StoreUtil; /** * The context listener will call this class when the uses view is being loaded. - * It checks if the uses view's necessary terms are present in the database. - * It will persist the terms that aren't present, using the CDMLib's services classes. - * @author a.theys + * It checks if the uses view's necessary terms are present in the database. + * It will persist the terms that aren't present, using the CDMLib's services classes. + * @author a.theys * @created mar 13, 2012 * @version 1.0 */ public class UseObjectManager extends ContextListenerAdapter{ - - + + @Override public void contextRefresh(IProgressMonitor monitor) { monitor.subTask("Refreshing the Uses View"); StoreUtil.warn(getClass(), "Refreshing Uses View warn"); setupNecessaryItems(monitor); } - - + + @Override public void contextStart(IMemento memento, IProgressMonitor monitor) { monitor.subTask("Starting the Uses View"); StoreUtil.warn(getClass(), "Starting Uses View warn"); setupNecessaryItems(monitor); } - + private void setupNecessaryItems(IProgressMonitor monitor) { - + //retrieve terms and vocabularies from db Feature featureUseRecord = (Feature) CdmStore.getService(ITermService.class).find(UsageTermCollection.uuidUseRecordFeature); Feature featureUseSummary = (Feature) CdmStore.getService(ITermService.class).find(UsageTermCollection.uuidUseSummaryFeature); - + ConversationHolder conversation = CdmStore.createConversation(); - - + + //create use marker type if not exists createUseMarkerType(conversation); - + //create state vocabulary if not exists createStateVocabulary(monitor, conversation); - + //create state vocabulary if not exists createCountryVocabulary(monitor, conversation); - + //create plant part vocabulary createPlantVocabulary(monitor, conversation); - + //create human group vocabulary createHumanGroupVocabulary(monitor, conversation); - + if(featureUseRecord == null || featureUseSummary == null) { - TermVocabulary featureVocabulary = (TermVocabulary)CdmStore.getService(IVocabularyService.class).find((UsageTermCollection.uuidFeatureVocabulary)); + TermVocabulary featureVocabulary = CdmStore.getService(IVocabularyService.class).find((UsageTermCollection.uuidFeatureVocabulary)); FeatureTree palmWebFeatureTree = CdmStore.getService(IFeatureTreeService.class).find(UsageTermCollection.uuidPalmWebFeatureTree); - + if (featureUseRecord == null ) { featureUseRecord = Feature.NewInstance(UsageTermCollection.useRecordFeatureLabel, UsageTermCollection.useRecordFeatureLabel, null); featureUseRecord.setUuid(UsageTermCollection.uuidUseRecordFeature); @@ -109,20 +109,20 @@ public class UseObjectManager extends ContextListenerAdapter{ StoreUtil.warn(getClass(), "No current feature tree available to add use summary feature"); } } - + CdmStore.getService(IVocabularyService.class).saveOrUpdate(featureVocabulary); if (palmWebFeatureTree != null){ CdmStore.getService(IFeatureTreeService.class).saveOrUpdate(palmWebFeatureTree); } conversation.commit(true); - + } - conversation.close(); + conversation.close(); } private void createHumanGroupVocabulary(IProgressMonitor monitor,ConversationHolder conversation) { - TermVocabulary humanGroupVocabulary = (TermVocabulary) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidHumanGroupVocabulary); + TermVocabulary humanGroupVocabulary = CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidHumanGroupVocabulary); if (humanGroupVocabulary == null){ monitor.subTask("create human group vocabulary"); URI termSourceUri = null; @@ -131,27 +131,24 @@ public class UseObjectManager extends ContextListenerAdapter{ } catch (URISyntaxException e) { e.printStackTrace(); } - + //FIXME:3.3MC---- //humanGroupVocabulary = TermVocabulary.NewInstance(UsageTermCollection.humanGroupLabel, UsageTermCollection.humanGroupLabel, null, termSourceUri); - humanGroupVocabulary = null; - humanGroupVocabulary.setUuid(UsageTermCollection.uuidHumanGroupVocabulary); +// humanGroupVocabulary.setUuid(UsageTermCollection.uuidHumanGroupVocabulary); //FIXME:3.3MC---- - + //FIXME:3.3MC---- //DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null); - DefinedTerm newDummyModifier = null; - newDummyModifier.setUuid(UsageTermCollection.uuidHumanGroupDummy); +// newDummyModifier.setUuid(UsageTermCollection.uuidHumanGroupDummy); //FIXME:3.3MC---- - + //FIXME:3.3MC---- //DefinedTerm newSubDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null); - DefinedTerm newSubDummyModifier = null; - newSubDummyModifier.setUuid(UsageTermCollection.uuidEthnicGroupDummy); +// newSubDummyModifier.setUuid(UsageTermCollection.uuidEthnicGroupDummy); +// newDummyModifier.addIncludes(newSubDummyModifier); +// humanGroupVocabulary.addTerm(newDummyModifier); //FIXME:3.3MC---- - - newDummyModifier.addIncludes(newSubDummyModifier); - humanGroupVocabulary.addTerm(newDummyModifier); + CdmStore.getService(IVocabularyService.class).saveOrUpdate(humanGroupVocabulary); conversation.commit(true); } @@ -159,7 +156,7 @@ public class UseObjectManager extends ContextListenerAdapter{ private void createPlantVocabulary(IProgressMonitor monitor, ConversationHolder conversation) { - TermVocabulary plantPartVocabulary = (TermVocabulary) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidPlantPartVocabulary); + TermVocabulary plantPartVocabulary = CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidPlantPartVocabulary); if (plantPartVocabulary == null){ monitor.subTask("create plant part vocabulary"); URI termSourceUri = null; @@ -170,17 +167,15 @@ public class UseObjectManager extends ContextListenerAdapter{ } //FIXME:3.3MC---- //plantPartVocabulary = TermVocabulary.NewInstance(UsageTermCollection.plantPartLabel, UsageTermCollection.plantPartLabel, null, termSourceUri); - plantPartVocabulary = null; - plantPartVocabulary.setUuid(UsageTermCollection.uuidPlantPartVocabulary); +// plantPartVocabulary.setUuid(UsageTermCollection.uuidPlantPartVocabulary); //FIXME:3.3MC---- - + //FIXME:3.3MC---- //DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null); - DefinedTerm newDummyModifier = null; - newDummyModifier.setUuid(UsageTermCollection.uuidPlantPartDummy); - plantPartVocabulary.addTerm(newDummyModifier); +// newDummyModifier.setUuid(UsageTermCollection.uuidPlantPartDummy); +// plantPartVocabulary.addTerm(newDummyModifier); //FIXME:3.3MC---- - + CdmStore.getService(IVocabularyService.class).saveOrUpdate(plantPartVocabulary); conversation.commit(true); } @@ -188,7 +183,7 @@ public class UseObjectManager extends ContextListenerAdapter{ private void createCountryVocabulary(IProgressMonitor monitor, ConversationHolder conversation) { - TermVocabulary countryVocabulary = (TermVocabulary) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidCountryVocabulary); + TermVocabulary countryVocabulary = CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidCountryVocabulary); if (countryVocabulary == null){ monitor.subTask("create country vocabulary"); URI termSourceUri = null; @@ -199,16 +194,14 @@ public class UseObjectManager extends ContextListenerAdapter{ } //FIXME:3.3MC---- //countryVocabulary = TermVocabulary.NewInstance(UsageTermCollection.countryLabel, UsageTermCollection.countryLabel, null, termSourceUri); - countryVocabulary = null; - countryVocabulary.setUuid(UsageTermCollection.uuidCountryVocabulary); +// countryVocabulary.setUuid(UsageTermCollection.uuidCountryVocabulary); //FIXME:3.3MC---- - + //FIXME:3.3MC---- //DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null); - DefinedTerm newDummyModifier = null; - newDummyModifier.setUuid(UsageTermCollection.uuidCountryDummy); +// newDummyModifier.setUuid(UsageTermCollection.uuidCountryDummy); +// countryVocabulary.addTerm(newDummyModifier); //FIXME:3.3MC---- - countryVocabulary.addTerm(newDummyModifier); CdmStore.getService(IVocabularyService.class).saveOrUpdate(countryVocabulary); conversation.commit(true); } @@ -216,7 +209,7 @@ public class UseObjectManager extends ContextListenerAdapter{ private void createStateVocabulary(IProgressMonitor monitor, ConversationHolder conversation) { - TermVocabulary stateVocabulary = (TermVocabulary) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidUseCategoryVocabulary); + TermVocabulary stateVocabulary = CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidUseCategoryVocabulary); if (stateVocabulary == null){ monitor.subTask("create state vocabulary"); URI termSourceUri = null; @@ -227,15 +220,16 @@ public class UseObjectManager extends ContextListenerAdapter{ } //FIXME:3.3MC---- //stateVocabulary = TermVocabulary.NewInstance(UsageTermCollection.useCategoryVocabularyLabel, UsageTermCollection.useCategoryVocabularyLabel, null, termSourceUri); - stateVocabulary = null; - stateVocabulary.setUuid(UsageTermCollection.uuidUseCategoryVocabulary); +// stateVocabulary.setUuid(UsageTermCollection.uuidUseCategoryVocabulary); //FIXME:3.3MC---- State newDummyState = State.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null); newDummyState.setUuid(UsageTermCollection.uuidUseCategoryDummy); State newDummySubCat = State.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null); newDummySubCat.setUuid(UsageTermCollection.uuidUseSubCategoryDummy); newDummyState.addIncludes(newDummySubCat); - stateVocabulary.addTerm(newDummyState); + //FIXME:3.3MC---- +// stateVocabulary.addTerm(newDummyState); + //FIXME:3.3MC---- CdmStore.getService(IVocabularyService.class).saveOrUpdate(stateVocabulary); conversation.commit(true); } @@ -247,7 +241,7 @@ public class UseObjectManager extends ContextListenerAdapter{ if (useMarkertype == null){ useMarkertype = MarkerType.NewInstance(UsageTermCollection.useMakerLabel, UsageTermCollection.useMakerLabel, null); useMarkertype.setUuid( UsageTermCollection.uuidUseMarkerType); - TermVocabulary markerTypeVocabulary = (TermVocabulary)CdmStore.getService(IVocabularyService.class).find((UsageTermCollection.uuidMarkersVocabulary)); + TermVocabulary markerTypeVocabulary = CdmStore.getService(IVocabularyService.class).find((UsageTermCollection.uuidMarkersVocabulary)); markerTypeVocabulary.addTerm(useMarkertype); CdmStore.getService(IVocabularyService.class).saveOrUpdate(markerTypeVocabulary); conversation.commit(true); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java index 0b4d91728..d13534adb 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * The contents of this file are subject to the Mozilla Public License Version 1.1 * See LICENSE.TXT at the top of this package for the full license terms. */ @@ -12,6 +12,7 @@ package eu.etaxonomy.taxeditor.ui.section.name; import java.util.Arrays; +import org.apache.log4j.Logger; import org.eclipse.swt.SWT; import eu.etaxonomy.cdm.model.name.BotanicalName; @@ -40,6 +41,8 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement */ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement implements ISelectableElement, IEnableableFormElement{ + private final Logger logger = Logger.getLogger(NameDetailElement.class); + private TermComboElement combo_rank; private TextWithLabelElement text_appendedPhrase; private TextWithLabelElement text_uninomial; @@ -52,7 +55,7 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElementConstructor for NameDetailElement.

* @@ -72,20 +75,20 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement