eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/OpenNameRelationsListWizardAction.java -text
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/OpenNewTaxonEditorAction.java -text
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/OpenTaxonEditorAction.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/DescriptionController.java -text
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/EditorController.java -text
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/GlobalController.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/PreferencesController.java -text
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/PropertySheetController.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ReferenceController.java -text
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/SearchController.java -text
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/TreeController.java -text
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/datasource/CdmDataSourceDialog.java -text
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/preference/InitNomenclaturalCodePrefDialog.java -text
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/preference/InitializeDbPreferences.java -text
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/preference/PreferencesController.java -text
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/preference/RankMenuPreferences.java -text
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/preference/TaxonomicPreferences.java -text
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/AnnotationPropertySource.java -text
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
import eu.etaxonomy.taxeditor.controller.GlobalController;
+import eu.etaxonomy.taxeditor.controller.PreferencesController;
import eu.etaxonomy.taxeditor.preference.InitNomenclaturalCodePrefDialog;
-import eu.etaxonomy.taxeditor.preference.PreferencesController;
/**
* @author p.ciardelli
import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
import eu.etaxonomy.cdm.model.name.ZoologicalName;\r
import eu.etaxonomy.taxeditor.ITaxEditorConstants;\r
-import eu.etaxonomy.taxeditor.preference.PreferencesController;\r
+import eu.etaxonomy.taxeditor.controller.PreferencesController;\r
\r
/**\r
* @author p.ciardelli\r
import eu.etaxonomy.taxeditor.ITaxEditorConstants;\r
import eu.etaxonomy.taxeditor.TaxEditorPlugin;\r
import eu.etaxonomy.taxeditor.controller.EditorController;\r
+import eu.etaxonomy.taxeditor.controller.PreferencesController;\r
import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository;\r
import eu.etaxonomy.taxeditor.model.CdmSessionDataRepository;\r
-import eu.etaxonomy.taxeditor.preference.PreferencesController;\r
\r
/**\r
* Opens a name editor for a new, uninitialized taxon. \r
--- /dev/null
+// $Id$\r
+/**\r
+* Copyright (C) 2007 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+\r
+package eu.etaxonomy.taxeditor.controller;\r
+\r
+import org.apache.log4j.Logger;\r
+\r
+import eu.etaxonomy.cdm.model.common.Language;\r
+import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
+import eu.etaxonomy.cdm.model.description.TextData;\r
+\r
+/**\r
+ * @author p.ciardelli\r
+ * @created 02.04.2009\r
+ * @version 1.0\r
+ */\r
+public class DescriptionController {\r
+ private static final Logger logger = Logger\r
+ .getLogger(DescriptionController.class);\r
+\r
+ /**\r
+ * Returns whatever the element's title cache equivalent is,\r
+ * depending on its class.\r
+ * \r
+ * @param element\r
+ * @param language\r
+ * @return \r
+ */\r
+ public static String getCache(DescriptionElementBase element, \r
+ Language language) {\r
+ String cache = null;\r
+ if (element instanceof TextData) {\r
+ cache = ((TextData) element).getText(language);\r
+ }\r
+ return cache == null ? "" : cache;\r
+ }\r
+\r
+ /**\r
+ * Returns whatever the element's title cache equivalent is,\r
+ * depending on its class, using the default language.\r
+ * \r
+ * @param element\r
+ * @return \r
+ */\r
+ public static String getCache(DescriptionElementBase element) {\r
+ return getCache(element, Language.DEFAULT());\r
+ }\r
+ \r
+ /**\r
+ * Set whatever the element's title cache equivalent is,\r
+ * depending on its class.\r
+ * \r
+ * @param element\r
+ * @param value\r
+ * @param language\r
+ */\r
+ public static void setCache(DescriptionElementBase element,\r
+ String value, Language language) {\r
+ if (element instanceof TextData) {\r
+ ((TextData) element).putText(value, language);\r
+ }\r
+ }\r
+ \r
+ /**\r
+ * Set whatever the element's title cache equivalent is,\r
+ * depending on its class, using the default language.\r
+ * \r
+ * @param element\r
+ * @param value\r
+ */ \r
+ public static void setCache(DescriptionElementBase element,\r
+ String value) {\r
+ setCache(element, value, Language.DEFAULT());\r
+ }\r
+}\r
import eu.etaxonomy.taxeditor.model.NameEditorInput;\r
import eu.etaxonomy.taxeditor.navigation.RecentNamesView;\r
import eu.etaxonomy.taxeditor.navigation.TaxonomicTreeViewer;\r
-import eu.etaxonomy.taxeditor.preference.PreferencesController;\r
\r
/**\r
* @author n.hoffmann\r
package eu.etaxonomy.taxeditor.controller;\r
\r
import java.net.URL;\r
+import java.util.List;\r
import java.util.Set;\r
import java.util.SortedSet;\r
\r
import eu.etaxonomy.taxeditor.TaxEditorPlugin;\r
import eu.etaxonomy.taxeditor.editor.images.UrlDialog;\r
import eu.etaxonomy.taxeditor.model.CdmSessionDataRepository;\r
-import eu.etaxonomy.taxeditor.preference.PreferencesController;\r
\r
/**\r
* A collection of useful methods related to the UI.\r
public class GlobalController {\r
private static final Logger logger = Logger.getLogger(GlobalController.class);\r
\r
- private static Set<Feature> preferredFeatureSet;\r
+ private static List<Feature> preferredFeatureSet;\r
private static Set<Rank> preferredRankSet;\r
\r
/**\r
return statusLineManager.getProgressMonitor();\r
}\r
\r
- public static Set<Feature> getPreferredFeatures() {\r
+ public static List<Feature> getPreferredFeatures() {\r
return preferredFeatureSet;\r
}\r
\r
- public static void setPreferredFeatures(Set<Feature> preferredFeatureSet) {\r
+ public static void setPreferredFeatures(List<Feature> preferredFeatureSet) {\r
GlobalController.preferredFeatureSet = preferredFeatureSet;\r
}\r
\r
* See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
\r
-package eu.etaxonomy.taxeditor.preference;\r
+package eu.etaxonomy.taxeditor.controller;\r
\r
+import java.util.ArrayList;\r
+import java.util.Collections;\r
+import java.util.HashMap;\r
import java.util.HashSet;\r
+import java.util.List;\r
+import java.util.Map;\r
import java.util.Set;\r
import java.util.SortedSet;\r
+import java.util.TreeMap;\r
\r
import org.apache.log4j.Logger;\r
import org.eclipse.jface.preference.IPreferenceStore;\r
import eu.etaxonomy.cdm.model.name.ZoologicalName;\r
import eu.etaxonomy.taxeditor.ITaxEditorConstants;\r
import eu.etaxonomy.taxeditor.TaxEditorPlugin;\r
-import eu.etaxonomy.taxeditor.controller.GlobalController;\r
import eu.etaxonomy.taxeditor.model.CdmSessionDataRepository;\r
\r
/**\r
* </p>\r
* @return\r
*/\r
- public static Set<Feature> getPreferredFeatures() {\r
+ public static List<Feature> getPreferredFeatures() {\r
\r
// Initialize preferredFeatureSet as necessary\r
if (GlobalController.getPreferredFeatures() == null) {\r
- \r
- GlobalController.setPreferredFeatures(new HashSet<Feature>()); \r
- \r
- for (Feature feature : CdmSessionDataRepository.getDefault().getFeatures()) {\r
\r
+ GlobalController.setPreferredFeatures(new ArrayList<Feature>());\r
+ for (Feature feature : CdmSessionDataRepository.getDefault().getFeatures()) {\r
+ \r
// If the feature is set to show, add it to preferredFeatureSet\r
if (PreferencesController.getFeaturePreference(feature)) {\r
GlobalController.addPreferredFeature(feature);\r
}\r
+ \r
}\r
- \r
}\r
return GlobalController.getPreferredFeatures();\r
}\r
--- /dev/null
+// $Id$\r
+/**\r
+* Copyright (C) 2007 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+\r
+package eu.etaxonomy.taxeditor.controller;\r
+\r
+import org.apache.log4j.Logger;\r
+\r
+import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;\r
+import eu.etaxonomy.cdm.model.reference.Generic;\r
+import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
+\r
+/**\r
+ * @author p.ciardelli\r
+ * @created 02.04.2009\r
+ * @version 1.0\r
+ */\r
+public class ReferenceController {\r
+ private static final Logger logger = Logger\r
+ .getLogger(ReferenceController.class);\r
+\r
+ /**\r
+ * Returns the entity's citation. If none exists, gives the\r
+ * entity a Generic citation.\r
+ * \r
+ * @param entity \r
+ * @return\r
+ */\r
+ public static ReferenceBase getOrCreateCitation(ReferencedEntityBase entity) {\r
+ ReferenceBase citation = entity.getCitation();\r
+ if (citation == null) {\r
+ citation = Generic.NewInstance();\r
+ entity.setCitation(citation);\r
+ }\r
+ return citation;\r
+ }\r
+}\r
import eu.etaxonomy.cdm.model.description.TextData;\r
import eu.etaxonomy.taxeditor.ITaxEditorConstants;\r
import eu.etaxonomy.taxeditor.TaxEditorPlugin;\r
+import eu.etaxonomy.taxeditor.controller.DescriptionController;\r
import eu.etaxonomy.taxeditor.controller.EditorController;\r
import eu.etaxonomy.taxeditor.controller.GlobalController;\r
import eu.etaxonomy.taxeditor.editor.ContextMenu;\r
private void initTextViewer() {\r
\r
String text = null;\r
- if (element instanceof TextData) {\r
- text = ((TextData) element).getText(Language.DEFAULT());\r
- }\r
- if (text == null) {\r
- text = "";\r
- }\r
+// if (element instanceof TextData) {\r
+// text = ((TextData) element).getText(Language.DEFAULT());\r
+// }\r
+// if (text == null) {\r
+// text = "";\r
+// }\r
+ text = DescriptionController.getCache(element);\r
\r
if (text.length() == 0) {\r
initEmptyText();\r
\r
protected void parse(String text) {\r
\r
- if (getElement() instanceof TextData) {\r
- ((TextData) getElement()).putText(text, Language.DEFAULT());\r
- }\r
+// if (getElement() instanceof TextData) {\r
+// ((TextData) getElement()).putText(text, Language.DEFAULT());\r
+// \r
+// }\r
+ DescriptionController.setCache(getElement(), text);\r
+ \r
+ // Manually refresh the property sheet to reflect changes\r
+ setSelection();\r
\r
setDirty(true);\r
}\r
import eu.etaxonomy.taxeditor.TaxEditorPlugin;\r
import eu.etaxonomy.taxeditor.controller.EditorController;\r
import eu.etaxonomy.taxeditor.controller.GlobalController;\r
+import eu.etaxonomy.taxeditor.controller.PreferencesController;\r
import eu.etaxonomy.taxeditor.editor.ContextMenu;\r
import eu.etaxonomy.taxeditor.editor.GroupedComposite;\r
import eu.etaxonomy.taxeditor.operations.description.AddElementOperation;\r
-import eu.etaxonomy.taxeditor.preference.PreferencesController;\r
import eu.etaxonomy.taxeditor.propertysheet.description.TaxonDescriptionPropertySource;\r
\r
/**\r
featuresMenu.addMenuListener(new IMenuListener() {\r
public void menuAboutToShow(IMenuManager manager) {\r
for (final Feature feature : PreferencesController.getPreferredFeatures()) {\r
- \r
String text = feature.getLabel();\r
manager.add(new Action(text){\r
\r
\r
protected void parse(String text) {\r
getDescription().setTitleCache(text);\r
+ \r
+ // Manually refresh the property sheet to reflect changes\r
+ setSelection();\r
+ \r
setDirty(true); \r
}\r
\r
this.url = url;\r
\r
setIsDraggable(false);\r
- setIcon(AcceptedNameComposite.ACCEPTED_ICON);\r
+// setIcon(AcceptedNameComposite.ACCEPTED_ICON);\r
setIndent(AcceptedNameComposite.ACCEPTED_INDENT);\r
\r
createImage(url);\r
import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
import eu.etaxonomy.cdm.strategy.parser.INonViralNameParser;\r
import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl;\r
-import eu.etaxonomy.taxeditor.preference.PreferencesController;\r
+import eu.etaxonomy.taxeditor.controller.PreferencesController;\r
\r
/**\r
* @author p.ciardelli\r
import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
import eu.etaxonomy.cdm.model.taxon.Taxon;\r
import eu.etaxonomy.taxeditor.controller.EditorController;\r
+import eu.etaxonomy.taxeditor.controller.PreferencesController;\r
import eu.etaxonomy.taxeditor.controller.TreeController;\r
-import eu.etaxonomy.taxeditor.preference.PreferencesController;\r
\r
/**\r
* @author n.hoffmann\r
\r
import java.util.ArrayList;\r
import java.util.Collection;\r
+import java.util.Collections;\r
import java.util.HashMap;\r
import java.util.HashSet;\r
import java.util.List;\r
import org.eclipse.swt.widgets.Display;\r
\r
import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
-import eu.etaxonomy.cdm.api.service.IReferenceService;\r
import eu.etaxonomy.cdm.api.service.ITermService;\r
-import eu.etaxonomy.cdm.api.service.ReferenceServiceImpl;\r
import eu.etaxonomy.cdm.model.common.Language;\r
import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;\r
import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
import eu.etaxonomy.cdm.model.taxon.Taxon;\r
import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
+import eu.etaxonomy.taxeditor.controller.GlobalController;\r
import eu.etaxonomy.taxeditor.controller.TreeController;\r
import eu.etaxonomy.taxeditor.datasource.CdmTransactionController;\r
import eu.etaxonomy.taxeditor.editor.name.CdmParserController;\r
\r
private List<ICdmTaxonSetListener> listeners;\r
\r
- private TermVocabulary<Feature> features;\r
+ private List<Feature> features;\r
\r
private SortedSet<Rank> ranks;\r
\r
}\r
\r
\r
- public TermVocabulary<Feature> getFeatures() {\r
+ public List<Feature> getFeatures() {\r
if (features == null) {\r
- features = getApplicationController().getDescriptionService().\r
- getDefaultFeatureVocabulary();\r
+ \r
+ Map<String, Feature> featuresMap = new HashMap<String, Feature>();\r
+ \r
+ for (Feature feature : getApplicationController().getDescriptionService().\r
+ getDefaultFeatureVocabulary()) {\r
+ featuresMap.put(feature.getLabel(), feature);\r
+ }\r
+ \r
+ // Alphabetize features by label\r
+ List<String> labels = new ArrayList<String>();\r
+ labels.addAll(featuresMap.keySet());\r
+ Collections.sort(labels);\r
+ \r
+ features = new ArrayList<Feature>();\r
+ for (String label : labels) {\r
+ features.add(featuresMap.get(label));\r
+ }\r
}\r
return features;\r
}\r
package eu.etaxonomy.taxeditor.model;\r
\r
import java.util.Collection;\r
+import java.util.List;\r
import java.util.Set;\r
import java.util.SortedSet;\r
\r
\r
public void setTaxonomicParent(Taxon taxon, Taxon newParentTaxon);\r
\r
- public TermVocabulary<Feature> getFeatures();\r
+ public List<Feature> getFeatures();\r
\r
public SortedSet<Rank> getRanks();\r
\r
import eu.etaxonomy.taxeditor.actions.ui.OpenTaxonEditorAction;\r
import eu.etaxonomy.taxeditor.controller.EditorController;\r
import eu.etaxonomy.taxeditor.controller.GlobalController;\r
+import eu.etaxonomy.taxeditor.controller.PreferencesController;\r
import eu.etaxonomy.taxeditor.editor.name.CdmParserController;\r
import eu.etaxonomy.taxeditor.model.CdmSessionDataRepository;\r
import eu.etaxonomy.taxeditor.model.CdmUtil;\r
import eu.etaxonomy.taxeditor.model.ICdmTaxonSetListener;\r
import eu.etaxonomy.taxeditor.operations.MoveTaxonOperation;\r
-import eu.etaxonomy.taxeditor.preference.PreferencesController;\r
\r
/**\r
* Taxon tree viewer which responds to events within individual taxa.\r
package eu.etaxonomy.taxeditor.preference;\r
\r
import java.util.HashMap;\r
+import java.util.List;\r
import java.util.Map;\r
\r
import org.apache.log4j.Logger;\r
import org.eclipse.ui.IWorkbench;\r
import org.eclipse.ui.IWorkbenchPreferencePage;\r
\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
import eu.etaxonomy.cdm.model.description.Feature;\r
+import eu.etaxonomy.taxeditor.controller.PreferencesController;\r
import eu.etaxonomy.taxeditor.model.CdmSessionDataRepository;\r
-import eu.etaxonomy.taxeditor.model.CdmUtil;\r
\r
/**\r
* @author p.ciardelli\r
gridLayout.numColumns = 3;\r
container.setLayout(gridLayout);\r
\r
- TermVocabulary<Feature> features = \r
+ List<Feature> features = \r
CdmSessionDataRepository.getDefault().getFeatures();\r
\r
for (Feature feature : features) {\r
import org.eclipse.swt.widgets.Shell;\r
\r
import eu.etaxonomy.taxeditor.ITaxEditorConstants;\r
+import eu.etaxonomy.taxeditor.controller.PreferencesController;\r
\r
/** \r
* @author p.ciardelli\r
import org.eclipse.ui.IWorkbenchPreferencePage;\r
\r
import eu.etaxonomy.taxeditor.ITaxEditorConstants;\r
+import eu.etaxonomy.taxeditor.controller.PreferencesController;\r
\r
/**\r
* @author p.ciardelli\r
import org.eclipse.ui.IWorkbenchPreferencePage;\r
\r
import eu.etaxonomy.cdm.model.name.Rank;\r
+import eu.etaxonomy.taxeditor.controller.PreferencesController;\r
import eu.etaxonomy.taxeditor.model.CdmSessionDataRepository;\r
import eu.etaxonomy.taxeditor.model.CdmUtil;\r
\r
import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
import org.eclipse.ui.views.properties.IPropertySource;\r
import org.eclipse.ui.views.properties.PropertyDescriptor;\r
+import org.eclipse.ui.views.properties.TextPropertyDescriptor;\r
\r
+import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.model.description.CommonTaxonName;\r
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
import eu.etaxonomy.cdm.model.description.Distribution;\r
import eu.etaxonomy.cdm.model.description.QuantitativeData;\r
import eu.etaxonomy.cdm.model.description.TaxonInteraction;\r
import eu.etaxonomy.cdm.model.description.TextData;\r
-import eu.etaxonomy.cdm.model.reference.Generic;\r
import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
import eu.etaxonomy.taxeditor.ITaxEditorConstants;\r
+import eu.etaxonomy.taxeditor.controller.DescriptionController;\r
+import eu.etaxonomy.taxeditor.controller.ReferenceController;\r
import eu.etaxonomy.taxeditor.propertysheet.reference.IReferenceSearch;\r
import eu.etaxonomy.taxeditor.propertysheet.reference.ReferencePropertySource;\r
import eu.etaxonomy.taxeditor.propertysheet.reference.ReferenceSearchDescriptor;\r
* Property unique keys\r
*/\r
public static final String P_ID_ELEMENT_CLASS = "element_class";\r
+ public static final String P_ID_ELEMENT_TEXT = "text";\r
public static final String P_ID_FEATURE = "feature";\r
public static final String P_ID_BIBREF = "bibref";\r
+ public static final String P_ID_MICROREF = "microref";\r
\r
/**\r
* Property display keys\r
* @see eu.etaxonomy.taxeditor.propertysheet.EditorPropertySheetEntry\r
*/\r
public static final String P_ELEMENT_CLASS = "01:Save element as";\r
- public static final String P_FEATURE = "00:Feature";\r
+ public static final String P_ELEMENT_TEXT = "00:Element";\r
+ public static final String P_FEATURE = "01:Feature";\r
public static final String P_BIBREF = "02:Bibliographic Reference";\r
+ public static final String P_MICROREF = "03:Reference Detail";\r
\r
-// protected static final String[] TOP_LEVEL_PROPERTIES = new String[] {P_ID_ELEMENT_CLASS, P_ID_FEATURE, P_ID_BIBREF};\r
- protected static final String[] TOP_LEVEL_PROPERTIES = new String[] {P_ID_BIBREF};\r
+ protected static final String[] TOP_LEVEL_PROPERTIES = \r
+ new String[] {P_ID_ELEMENT_TEXT, P_ID_FEATURE, P_ID_BIBREF, P_ID_MICROREF};\r
\r
private String[] P_FEATURE_CLASS_NAME_MENU;\r
private Class[] P_FEATURE_CLASSES;\r
}\r
\r
if (id.equals(P_ID_BIBREF)) {\r
- descriptors.addElement(new ReferenceSearchDescriptor(P_ID_BIBREF, P_BIBREF, IReferenceSearch.BIBREF) {\r
- protected void saveReference(ReferenceBase reference) {\r
- setPropertyValue(P_ID_BIBREF, reference);\r
- }\r
- }); \r
-// descriptors.addElement(new TextPropertyDescriptor(P_ID_BIBREF, P_BIBREF));\r
+// descriptors.addElement(new ReferenceSearchDescriptor(P_ID_BIBREF, P_BIBREF, IReferenceSearch.BIBREF) {\r
+// protected void saveReference(ReferenceBase reference) {\r
+// setPropertyValue(P_ID_BIBREF, reference);\r
+// }\r
+// }); \r
+ descriptors.addElement(new PropertyDescriptor(P_ID_BIBREF, P_BIBREF));\r
+ }\r
+ if (id.equals(P_ID_ELEMENT_TEXT)) {\r
+ descriptors.addElement(new TextPropertyDescriptor(P_ID_ELEMENT_TEXT, P_ELEMENT_TEXT));\r
+ }\r
+ \r
+ if (id.equals(P_ID_MICROREF)) {\r
+ descriptors.addElement(new TextPropertyDescriptor(P_ID_MICROREF, P_MICROREF));\r
}\r
}\r
\r
}\r
});\r
return bibRefPropertySource;\r
- } \r
+ }\r
+ \r
+ if (id.equals(P_ID_ELEMENT_TEXT)) {\r
+ return DescriptionController.getCache(descriptionElement); \r
+ }\r
+\r
+ if (id.equals(P_ID_MICROREF)) {\r
+ return CdmUtils.Nz(descriptionElement.getCitationMicroReference());\r
+ }\r
\r
return null;\r
}\r
descriptionElement.setCitation((ReferenceBase) value);\r
}\r
\r
- if (value instanceof String) {\r
- \r
- }\r
- ReferenceBase bibRef = descriptionElement.getCitation();\r
- if (bibRef == null) {\r
- bibRef = Generic.NewInstance();\r
- descriptionElement.setCitation(bibRef);\r
- }\r
+ ReferenceBase bibRef = \r
+ ReferenceController.getOrCreateCitation(descriptionElement);\r
\r
// "value" is the ReferencePropertySource, so we get the TitleCache from its\r
// toString() method\r
bibRef.setTitleCache(value.toString());\r
}\r
\r
+ if (id.equals(P_ID_ELEMENT_TEXT)) {\r
+ DescriptionController.setCache(descriptionElement, (String) value);\r
+ }\r
+ \r
+ if (id.equals(P_ID_MICROREF)) {\r
+ descriptionElement.setCitationMicroReference((String) value);\r
+ }\r
+ \r
descriptionElement.firePropertyChange(ITaxEditorConstants.PROPERTY_SHEET_CHANGE, null, null);\r
}\r
}\r
private String parentid;\r
\r
// Property unique keys\r
- public static final String P_ID_LABEL = "label";\r
public static final String P_ID_UUID = "uuid";\r
+ public static final String P_ID_LABEL = "label";\r
\r
// Property display keys\r
// Note: for an explanation of the sorting prefixes ("04:"), \r
// @see eu.etaxonomy.taxeditor.propertysheet.CustomSortPropertySheetEntry\r
- public static final String P_LABEL = "00:Description Text";\r
- public static final String P_UUID = "01:UUID"; \r
+ public static final String P_UUID = "00:UUID"; \r
+ public static final String P_LABEL = "01:Description Label";\r
\r
// protected static final String[] TOP_LEVEL_PROPERTIES = new String[] {\r
// P_ID_LABEL, P_ID_UUID};\r
protected static final String[] TOP_LEVEL_PROPERTIES = new String[] {\r
- P_ID_UUID}; \r
+ P_ID_LABEL}; \r
\r
/**\r
* Constructor for top level property fields. All fields that are not subfields\r
import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;\r
import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
import eu.etaxonomy.taxeditor.ITaxEditorConstants;\r
+import eu.etaxonomy.taxeditor.controller.PreferencesController;\r
import eu.etaxonomy.taxeditor.model.CdmSessionDataRepository;\r
-import eu.etaxonomy.taxeditor.preference.PreferencesController;\r
import eu.etaxonomy.taxeditor.propertysheet.AnnotationPropertySource;\r
import eu.etaxonomy.taxeditor.propertysheet.AnnotationsPropertyDescriptor;\r
import eu.etaxonomy.taxeditor.propertysheet.MarkersPropertySource;\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.model.name.NonViralName;\r
import eu.etaxonomy.taxeditor.ITaxEditorConstants;\r
-import eu.etaxonomy.taxeditor.preference.PreferencesController;\r
+import eu.etaxonomy.taxeditor.controller.PreferencesController;\r
\r
/**\r
* @author p.ciardelli\r
import eu.etaxonomy.cdm.model.reference.Generic;\r
import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
import eu.etaxonomy.taxeditor.TaxEditorPlugin;\r
-import eu.etaxonomy.taxeditor.preference.PreferencesController;\r
+import eu.etaxonomy.taxeditor.controller.PreferencesController;\r
import eu.etaxonomy.taxeditor.propertysheet.reference.IReferenceSearch;\r
import eu.etaxonomy.taxeditor.propertysheet.reference.ReferenceSearchDialog;\r
\r
BGBM BDI Projects / taxeditor.git / commitdiff