switched plugin version to 2.1

diff --git a/.gitattributes b/.gitattributes
index 59891b3877aca890b1290c4cd32aeefc45e8ff63..89e990bfb64b9f088b41e1bef863785896ab6544 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -309,6 +309,8 @@ eclipseprojects/eu.etaxonomy.taxeditor.prototype2/src/eu/etaxonomy/taxeditor/pro
 eclipseprojects/eu.etaxonomy.taxeditor.prototype2/src/eu/etaxonomy/taxeditor/prototype2/view/propertysheetsupport/PropertySheetContentProvider.java -text
 eclipseprojects/eu.etaxonomy.taxeditor.prototype2/src/eu/etaxonomy/taxeditor/prototype2/view/propertysheetsupport/PropertySheetValueEditingSupport.java -text
 eclipseprojects/eu.etaxonomy.taxeditor.prototype2/src/eu/etaxonomy/taxeditor/prototype2/view/propertysheetsupport/PropertySheetValueLabelProvider.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/.classpath -text
+eclipseprojects/eu.etaxonomy.taxeditor/.project -text
 eclipseprojects/eu.etaxonomy.taxeditor/META-INF/MANIFEST.MF -text
 eclipseprojects/eu.etaxonomy.taxeditor/build.properties -text
 eclipseprojects/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product -text

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/.classpath b/eclipseprojects/eu.etaxonomy.taxeditor/.classpath
new file mode 100644 (file)
index 0000000..1fa3e68
--- /dev/null
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/.project b/eclipseprojects/eu.etaxonomy.taxeditor/.project
new file mode 100644 (file)
index 0000000..4b68c1f
--- /dev/null
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<projectDescription>\r
+       <name>eu.etaxonomy.taxeditor</name>\r
+       <comment></comment>\r
+       <projects>\r
+       </projects>\r
+       <buildSpec>\r
+               <buildCommand>\r
+                       <name>org.eclipse.jdt.core.javabuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.eclipse.pde.ManifestBuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.eclipse.pde.SchemaBuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+       </buildSpec>\r
+       <natures>\r
+               <nature>org.eclipse.pde.PluginNature</nature>\r
+               <nature>org.eclipse.jdt.core.javanature</nature>\r
+       </natures>\r
+</projectDescription>\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/datasource/CdmDataSourceDialog.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/datasource/CdmDataSourceDialog.java
index 8720938e6ac3a92acd04958d2017eb1cc617ff9e..3db8f42a580bd5b021469ff7b5a333265e850dc4 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/datasource/CdmDataSourceDialog.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/datasource/CdmDataSourceDialog.java
@@ -91,7 +91,6 @@ public class CdmDataSourceDialog extends Dialog {
         * Any time user modifies datasource properties, force a save or a cancel\r
         */\r
        ModifyListener modifyListener = new ModifyListener() {\r
-               @Override\r
                public void modifyText(ModifyEvent e) {\r
                        forceUserToSave(true);\r
                }\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java
index a01167b10dc58cee5eff81daf9721f4f500c990c..5501c767816a575be820341e9e98e29527262232 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java
@@ -328,7 +328,6 @@ public class FreeTextElementFactory implements IFreeTextElementFactory {
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.taxeditor.editor.IFreeTextElementFactory#createImageElement(org.eclipse.ui.forms.ManagedForm, eu.etaxonomy.cdm.model.taxon.Taxon, java.net.URL)\r
         */\r
-       @Override\r
        public Composite createImageElement(ManagedForm form, Taxon taxon, URL url) {\r
                                \r
                // Get the taxon's form\r
@@ -382,7 +381,6 @@ public class FreeTextElementFactory implements IFreeTextElementFactory {
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.taxeditor.editor.IFreeTextElementFactory#createTaxonHasNoImagesElement(org.eclipse.ui.forms.ManagedForm, eu.etaxonomy.cdm.model.taxon.Taxon)\r
         */\r
-       @Override\r
        public Composite createTaxonHasNoImagesElement(ManagedForm form,\r
                        Taxon taxon) {\r
                // Get the taxon's form\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/ImageComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/ImageComposite.java
index a96bd24c6730e7958ce8c6e775087c02f65a0176..6cbe680576b9e9f9ca865a4204eb2fad03439bee 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/ImageComposite.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/ImageComposite.java
@@ -145,7 +145,6 @@ public class ImageComposite extends GroupedComposite {
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.taxeditor.editor.IHasPropertySource#getPropertySource()\r
         */\r
-       @Override\r
        public IPropertySource getPropertySource() {\r
                return new ImagePropertySource(getTaxon(), url);\r
        }\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/TaxonHasNoImagesComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/TaxonHasNoImagesComposite.java
index c8d470bd9db432fca6361789e9dbae3c418023e1..e20dce34fb7b34a045a9117da4625df1762ca66a 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/TaxonHasNoImagesComposite.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/TaxonHasNoImagesComposite.java
@@ -105,7 +105,6 @@ public class TaxonHasNoImagesComposite extends GroupedComposite {
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.taxeditor.editor.IHasPropertySource#getPropertySource()\r
         */\r
-       @Override\r
        public IPropertySource getPropertySource() {\r
                return null;\r
        }\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/UrlDialog.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/UrlDialog.java
index fd06b5deadd51f915587877998bc9152a44e7163..e974b3dd77ee72763baf40616c9b772062104aa5 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/UrlDialog.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/UrlDialog.java
@@ -42,7 +42,6 @@ public class UrlDialog extends InputDialog {
                super(parentShell, dialogTitle, \r
                                dialogMessage, "http://", new IInputValidator() {\r
 \r
-                                       @Override\r
                                        public String isValid(String text) {\r
                                                URL url = null;\r
                                                try {\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/ExportHandler.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/ExportHandler.java
index 8534978393517b433005a97f91bc7809adc46468..b955fde4add443b47e13e2adb0e96f1d1922ff91 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/ExportHandler.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/ExportHandler.java
@@ -30,7 +30,6 @@ public class ExportHandler extends AbstractHandler implements IHandler  {
        /* (non-Javadoc)\r
         * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)\r
         */\r
-       @Override\r
        public Object execute(ExecutionEvent event) throws ExecutionException {\r
                \r
                FileDialog dialog = new FileDialog(GlobalController.getShell());\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/ImportHandler.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/ImportHandler.java
index 12d5c3ba8755012d9ea529ed9dacadf0a0b44704..f25c13b2da2b143b94e14cdc4103d554b90cf969 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/ImportHandler.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/ImportHandler.java
@@ -30,7 +30,6 @@ public class ImportHandler extends AbstractHandler implements IHandler  {
        /* (non-Javadoc)\r
         * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)\r
         */\r
-       @Override\r
        public Object execute(ExecutionEvent event) throws ExecutionException {\r
                \r
                FileDialog dialog = new FileDialog(GlobalController.getShell());\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmSessionDataRepository.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmSessionDataRepository.java
index 426acfb1aff288f1cf1100e03e48dbf81b1c9d04..0b4ea745ae72dd3a3703d4402968a02869a6d505 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmSessionDataRepository.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmSessionDataRepository.java
@@ -489,7 +489,6 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.taxeditor.model.ICdmSessionDataRepository#getTypeDesignationStatus()\r
         */\r
-       @Override\r
        public TermVocabulary<TypeDesignationStatus> getTypeDesignationStatus() {\r
                if (typeStatus == null) {\r
                        typeStatus = getApplicationController().getNameService().getTypeDesignationVocabulary();\r
@@ -500,7 +499,6 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.taxeditor.model.ICdmSessionDataRepository#getLanguages()\r
         */\r
-       @Override\r
        public List<Language> getLanguages() {\r
                if (languages == null) {\r
                        \r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/TaxonomicTreeView.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/TaxonomicTreeView.java
index dafeed080903f698f4166f7feeb09ab8c99cb689..d6b188fe24931102c5ed887f31a43aa2b49dd5b0 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/TaxonomicTreeView.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/TaxonomicTreeView.java
@@ -187,7 +187,12 @@ public class TaxonomicTreeView extends ViewPart {
        private void setDataSourceText() {\r
                ICdmDataSource dataSource = CdmDataSourceRepository.getDefault().getCurrentDataSource();\r
                \r
-               lblDataSource.setText(dataSource.getDatabaseType().getConnectionString(dataSource));\r
+               try{\r
+                       lblDataSource.setText(dataSource.getDatabaseType().getConnectionString(dataSource));\r
+               }catch(NullPointerException e){\r
+                       logger.error("Unable to set the connection string for the current dataSource. Reason:", e);\r
+               }\r
+               \r
                lblDataSourceTitle.setText(getDataSourceName(dataSource));\r
 \r
                dbCompositeSub.layout();\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/operations/description/AddElementOperation.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/operations/description/AddElementOperation.java
index 46aff0c48a86c02883a6a1aab062a9b9970f1f48..f9ccacc63c42d150ebbf2d4211d02a75b9d6e116 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/operations/description/AddElementOperation.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/operations/description/AddElementOperation.java
@@ -55,7 +55,7 @@ public class AddElementOperation extends AbstractEditorOperation {
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
                        throws ExecutionException {\r
                \r
-               if (feature.isSupportsCommonTaxonName()) {\r
+               if (feature.supportsCommonTaxonName()) {\r
                        \r
                        // Get language for the common name\r
                        Language language = LanguageDialog.getLanguage\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/description/DescriptionElementPropertySource.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/description/DescriptionElementPropertySource.java
index 93ca0ed8cb44f49e508a286a6453bf335ee1f363..44f5a6e436a44997364a9c559703fa400e58b769 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/description/DescriptionElementPropertySource.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/description/DescriptionElementPropertySource.java
@@ -128,22 +128,22 @@ public class DescriptionElementPropertySource implements IPropertySource {
                        Map<Class, String> supportedClasses = new HashMap<Class, String>();\r
                        \r
                        // Populate feature class arrays with classes supported by this feature\r
-                       if (feature.isSupportsCommonTaxonName()) {\r
+                       if (feature.supportsCommonTaxonName()) {\r
                                supportedClasses.put(CommonTaxonName.class, "Common name");\r
                        }\r
-                       if (feature.isSupportsDistribution()) {\r
+                       if (feature.supportsDistribution()) {\r
                                supportedClasses.put(Distribution.class, "Distribution");                               \r
                        }\r
-                       if (feature.isSupportsIndividualAssociation()) {\r
+                       if (feature.supportsIndividualAssociation()) {\r
                                supportedClasses.put(IndividualsAssociation.class, "Individual association");                           \r
                        }\r
-                       if (feature.isSupportsQuantitativeData()) {\r
+                       if (feature.supportsQuantitativeData()) {\r
                                supportedClasses.put(QuantitativeData.class, "Quantitative data");                              \r
                        }\r
-                       if (feature.isSupportsTaxonInteraction()) {\r
+                       if (feature.supportsTaxonInteraction()) {\r
                                supportedClasses.put(TaxonInteraction.class, "Taxon interaction");                              \r
                        }\r
-                       if (feature.isSupportsTextData()) {\r
+                       if (feature.supportsTextData()) {\r
                                supportedClasses.put(TextData.class, "Text");                           \r
                        } \r
                        \r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/images/ImagePropertySource.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/images/ImagePropertySource.java
index 8eebef67451da7cd8e46371129bf2c7156f45d95..d756d77cb82e735d90ff4d363749af30e69168f1 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/images/ImagePropertySource.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/images/ImagePropertySource.java
@@ -70,7 +70,6 @@ public class ImagePropertySource implements IPropertySource {
        /* (non-Javadoc)\r
         * @see org.eclipse.ui.views.properties.IPropertySource#getEditableValue()\r
         */\r
-       @Override\r
        public Object getEditableValue() {\r
                return this;\r
        }\r
@@ -78,7 +77,6 @@ public class ImagePropertySource implements IPropertySource {
        /* (non-Javadoc)\r
         * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyDescriptors()\r
         */\r
-       @Override\r
        public IPropertyDescriptor[] getPropertyDescriptors() {\r
                return (IPropertyDescriptor[]) descriptors.toArray(\r
                 new IPropertyDescriptor[descriptors.size()]);\r
@@ -87,7 +85,6 @@ public class ImagePropertySource implements IPropertySource {
        /* (non-Javadoc)\r
         * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyValue(java.lang.Object)\r
         */\r
-       @Override\r
        public Object getPropertyValue(Object id) {\r
         if (id.equals(P_ID_URL)) {\r
                        return url.toString();\r
@@ -98,7 +95,6 @@ public class ImagePropertySource implements IPropertySource {
        /* (non-Javadoc)\r
         * @see org.eclipse.ui.views.properties.IPropertySource#isPropertySet(java.lang.Object)\r
         */\r
-       @Override\r
        public boolean isPropertySet(Object id) {\r
                return false;\r
        }\r
@@ -106,13 +102,11 @@ public class ImagePropertySource implements IPropertySource {
        /* (non-Javadoc)\r
         * @see org.eclipse.ui.views.properties.IPropertySource#resetPropertyValue(java.lang.Object)\r
         */\r
-       @Override\r
        public void resetPropertyValue(Object id) {}\r
 \r
        /* (non-Javadoc)\r
         * @see org.eclipse.ui.views.properties.IPropertySource#setPropertyValue(java.lang.Object, java.lang.Object)\r
         */\r
-       @Override\r
        public void setPropertyValue(Object id, Object value) {\r
                if (id.equals(P_ID_URL)) {\r
                        \r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java
index bb27b449ac6010f101f9215095b3898150dc1b1e..2fcbbe8e36d0ace08b35521d63f09dd50d49c9a3 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java
@@ -26,6 +26,7 @@ import org.eclipse.ui.views.properties.PropertyDescriptor;
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;\r
 \r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
+import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;\r
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;\r
@@ -441,7 +442,7 @@ public class NonViralNamePropertySource implements IPropertySource {
                if (name.getCreatedBy() == null) {\r
                        return "";\r
                } else {\r
-                       return CdmUtils.Nz(name.getCreatedBy().generateTitle());\r
+                       return CdmUtils.Nz(((IIdentifiableEntity) name.getCreatedBy()).generateTitle());\r
                }\r
         }\r
         \r
@@ -468,7 +469,7 @@ public class NonViralNamePropertySource implements IPropertySource {
                        nomRefPropertySource.addPropertyChangeListener(new PropertyChangeListener() {\r
                                public void propertyChange(PropertyChangeEvent evt) {\r
                                        if (evt.getNewValue() instanceof INomenclaturalReference) {\r
-                                               name.setNomenclaturalReference((INomenclaturalReference) evt.getNewValue());\r
+                                               name.setNomenclaturalReference((ReferenceBase) evt.getNewValue());\r
                                        }\r
                                }\r
                        });\r
@@ -541,7 +542,7 @@ public class NonViralNamePropertySource implements IPropertySource {
                // Nomenclatural reference        \r
         if (id.equals(P_ID_NOMENCLATURAL_REF)) {\r
                if (value instanceof INomenclaturalReference) {\r
-                       name.setNomenclaturalReference((INomenclaturalReference) value);\r
+                       name.setNomenclaturalReference((ReferenceBase) value);\r
                }\r
         }\r
         \r
@@ -576,7 +577,7 @@ public class NonViralNamePropertySource implements IPropertySource {
                        return name.getTitleCache(); \r
                }\r
                if (parentid.equals(P_ID_NOMENCLATURAL_REF)) {\r
-               INomenclaturalReference nomenclaturalReference = name.getNomenclaturalReference();\r
+               INomenclaturalReference nomenclaturalReference = (INomenclaturalReference) name.getNomenclaturalReference();\r
                if (nomenclaturalReference == null) {\r
                        return "";\r
                }               \r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/TypeCollectionPropertySource.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/TypeCollectionPropertySource.java
index 3e01991ddd23476307dc644a22ddce9dda0d91ce..76c920f3ccfd598abd8b03e08fb756117aeb3948 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/TypeCollectionPropertySource.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/TypeCollectionPropertySource.java
@@ -154,7 +154,6 @@ public class TypeCollectionPropertySource extends CollectionPropertySource {
                        this.typeDesignation = typeDesignation;\r
                }\r
                \r
-               @Override\r
                public Object getEditableValue() {\r
                        if (typeDesignation instanceof SpecimenTypeDesignation) {\r
                                return ((SpecimenTypeDesignation) typeDesignation).getTypeSpecimen().getTitleCache();\r
@@ -169,7 +168,6 @@ public class TypeCollectionPropertySource extends CollectionPropertySource {
                        return null;\r
                }\r
 \r
-               @Override\r
                public IPropertyDescriptor[] getPropertyDescriptors() {\r
                        return new IPropertyDescriptor[]{\r
                                        new PropertyDescriptor(\r
@@ -177,7 +175,6 @@ public class TypeCollectionPropertySource extends CollectionPropertySource {
                        };\r
                }\r
 \r
-               @Override\r
                public Object getPropertyValue(Object id) {\r
                        ReferenceBase reference = typeDesignation.getCitation();\r
                        if (reference == null) {\r
@@ -194,15 +191,12 @@ public class TypeCollectionPropertySource extends CollectionPropertySource {
                        return referencePropertySource;\r
                }\r
 \r
-               @Override\r
                public boolean isPropertySet(Object id) {\r
                        return false;\r
                }\r
 \r
-               @Override\r
                public void resetPropertyValue(Object id) {}\r
 \r
-               @Override\r
                public void setPropertyValue(Object id, Object value) {\r
                }\r
                \r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseNameTypeWizardPage.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseNameTypeWizardPage.java
index d0551f7510222f9e052aea7ce702549e9be29a79..64b54cb9756e4a27e92cb81488d533d0883e0162 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseNameTypeWizardPage.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseNameTypeWizardPage.java
@@ -85,7 +85,6 @@ public class ChooseNameTypeWizardPage extends WizardPage {
        /* (non-Javadoc)\r
         * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)\r
         */\r
-       @Override\r
        public void createControl(Composite parent) {\r
                \r
                // Create composite for popup dialog    \r
@@ -374,7 +373,7 @@ public class ChooseNameTypeWizardPage extends WizardPage {
                                \r
                if (typeDesignation == null) {\r
                        typeDesignation = new TemporaryNameTypeDesignation(typeName, citation, null,\r
-                                       null, btnRejected.getSelection(), btnConserved.getSelection(), btnNotDesignated.getSelection());\r
+                                       null, btnRejected.getSelection(), btnConserved.getSelection(), btnLecto.getSelection(), btnNotDesignated.getSelection());\r
                        typeDesignation.setLectoType(btnLecto.getSelection()); \r
                } else {\r
                        typeDesignation.setRejectedType(btnRejected.getSelection());\r
@@ -407,9 +406,9 @@ public class ChooseNameTypeWizardPage extends WizardPage {
 //             }\r
                \r
                public TemporaryNameTypeDesignation(TaxonNameBase typeName, ReferenceBase citation, String citationMicroReference,\r
-                               String originalNameString, boolean isRejectedType, boolean isConservedType, boolean isNotDesignated) {\r
+                               String originalNameString, boolean isRejectedType, boolean isConservedType, boolean isLectoType, boolean isNotDesignated) {\r
                        super(typeName, citation, citationMicroReference, originalNameString, \r
-                                       isRejectedType, isConservedType, isNotDesignated);\r
+                                       isRejectedType, isConservedType,  isLectoType, isNotDesignated);\r
                }\r
        }\r
 }\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java
index 585c1ae5cfedf5df5de6623a5d6b59305c403546..3c57d99876d703c966450b2eaba812526a615b7f 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java
@@ -85,7 +85,6 @@ public class ChooseSpecimenTypeWizardPage extends WizardPage {
        /* (non-Javadoc)\r
         * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)\r
         */\r
-       @Override\r
        public void createControl(Composite parent) {\r
                \r
                // Create composite for popup dialog    \r