(no commit message)

diff --git a/taxeditor-store/.settings/org.eclipse.jdt.core.prefs b/taxeditor-store/.settings/org.eclipse.jdt.core.prefs
index ec2cdbc3d9ec84eebe008daf1f90f549b9d0f8ce..eccf753c2d970fab64abf6666f6fa5fa1c91ec89 100644 (file)
--- a/taxeditor-store/.settings/org.eclipse.jdt.core.prefs
+++ b/taxeditor-store/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,5 @@
-#Fri Oct 16 18:08:11 CEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+#Mon Nov 02 18:16:54 CET 2009

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+eclipse.preferences.version=1

 org.eclipse.jdt.core.compiler.source=1.5
 org.eclipse.jdt.core.compiler.source=1.5

+org.eclipse.jdt.core.compiler.compliance=1.5

diff --git a/taxeditor-store/META-INF/MANIFEST.MF b/taxeditor-store/META-INF/MANIFEST.MF
index 295ffde0efd4b4738add6f28e9b6840abb36cf63..cc69944f1325d81f13834e2327c324adaf00495e 100644 (file)
--- a/taxeditor-store/META-INF/MANIFEST.MF
+++ b/taxeditor-store/META-INF/MANIFEST.MF
@@ -18,7 +18,9 @@ Export-Package: dbscripts,
  eu.etaxonomy.taxeditor.io,
  eu.etaxonomy.taxeditor.io.wizard,
  eu.etaxonomy.taxeditor.labels,
  eu.etaxonomy.taxeditor.io,
  eu.etaxonomy.taxeditor.io.wizard,
  eu.etaxonomy.taxeditor.labels,

- eu.etaxonomy.taxeditor.model;uses:="eu.etaxonomy.cdm.model.common,eu.etaxonomy.cdm.model.name,eu.etaxonomy.cdm.model.taxon",
+ eu.etaxonomy.taxeditor.model;uses:="eu.etaxonomy.cdm.model.common,
+ eu.etaxonomy.cdm.model.name,
+ eu.etaxonomy.cdm.model.taxon",

  eu.etaxonomy.taxeditor.operations,
  eu.etaxonomy.taxeditor.parser,
  eu.etaxonomy.taxeditor.preference,
  eu.etaxonomy.taxeditor.operations,
  eu.etaxonomy.taxeditor.parser,
  eu.etaxonomy.taxeditor.preference,


@@ -30,7 +32,7 @@ Export-Package: dbscripts,
  eu.etaxonomy.taxeditor.user.handler,
  eu.etaxonomy.taxeditor.user.view,
  eu.etaxonomy.taxeditor.user.wizard
  eu.etaxonomy.taxeditor.user.handler,
  eu.etaxonomy.taxeditor.user.view,
  eu.etaxonomy.taxeditor.user.wizard

-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",org.eclipse.core.filesystem;bundle-version="1.2.0",org.eclipse.core.resources;bundle-version="3.4.1",org.eclipse.ui.editors;bundle-version="3.4.0",org.eclipse.jface.text;bundle-version="3.4.1",org.eclipse.ui.ide;bundle-version="3.4.2",eu.etaxonomy.cdmlib;bundle-version="2.1.0"
+Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",org.eclipse.core.filesystem;bundle-version="1.2.0",org.eclipse.core.resources;bundle-version="3.4.1",org.eclipse.ui.editors;bundle-version="3.4.0",org.eclipse.jface.text;bundle-version="3.4.1",org.eclipse.ui.ide;bundle-version="3.4.2",eu.etaxonomy.cdmlib;bundle-version="2.3.0"

 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: junit.framework,org.junit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: junit.framework,org.junit
 Bundle-ActivationPolicy: lazy

diff --git a/taxeditor-store/pom.xml b/taxeditor-store/pom.xml
index 4333da073cae4e5b94e31f09948fbfdadf6edc40..23ac261e1f785ce8e8103f158471fa0d3d3ee093 100644 (file)
--- a/taxeditor-store/pom.xml
+++ b/taxeditor-store/pom.xml
@@ -4,14 +4,14 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>

-       <version>1.0</version>
+       <version>2.1</version>

   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-store</artifactId>
   <packaging>jar</packaging>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-store</artifactId>
   <packaging>jar</packaging>

-  <version>1.0</version>
+  <version>2.1</version>

   <name>DataStore Bundle</name>
   <description>Enables access to a CDM DataStore and provides operations on the model</description>
   <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorDataStoreBundle</url>
   <name>DataStore Bundle</name>
   <description>Enables access to a CDM DataStore and provides operations on the model</description>
   <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorDataStoreBundle</url>


@@ -20,14 +20,14 @@
     <dependency>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>cdmlib-services</artifactId>
     <dependency>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>cdmlib-services</artifactId>

-               <version>2.1</version>
+               <version>2.3</version>

        </dependency>
        <dependency>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>cdmlib-persistence</artifactId>
                <type>test-jar</type>
                <scope>test</scope>
        </dependency>
        <dependency>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>cdmlib-persistence</artifactId>
                <type>test-jar</type>
                <scope>test</scope>

-               <version>2.1</version>
+               <version>2.3</version>

        </dependency>
   </dependencies>
 </project>
        </dependency>
   </dependencies>
 </project>

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateDescriptionElementOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateDescriptionElementOperation.java
index 6b56194f8886ff6fcb7e1fb149c0116299df8f09..6c0a40ac3c3c21942da83ff3539bcc57d3338b1f 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateDescriptionElementOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateDescriptionElementOperation.java
@@ -73,13 +73,13 @@ public class CreateDescriptionElementOperation extends AbstractPostOperation {
                        throws ExecutionException {\r
                \r
                if (element == null) {\r
                        throws ExecutionException {\r
                \r
                if (element == null) {\r

-                       if (feature.supportsCommonTaxonName()) {\r
+                       if (feature.isSupportsCommonTaxonName()) {\r

                                element = CommonTaxonName.NewInstance("", null);\r
                                element = CommonTaxonName.NewInstance("", null);\r

-                       } else if (feature.supportsDistribution()) {\r
+                       } else if (feature.isSupportsDistribution()) {\r

                                element = Distribution.NewInstance();\r
                        } else if (feature.equals(Feature.IMAGE())){\r
                                element = ImagesHelper.createImageElement(ImageFile.NewInstance(null, null));\r
                                element = Distribution.NewInstance();\r
                        } else if (feature.equals(Feature.IMAGE())){\r
                                element = ImagesHelper.createImageElement(ImageFile.NewInstance(null, null));\r

-                       } else if(feature.supportsTaxonInteraction()){\r
+                       } else if(feature.isSupportsTaxonInteraction()){\r

                                element = TaxonInteraction.NewInstance(feature);\r
                        } else {\r
                                element = TextData.NewInstance(feature);\r
                                element = TaxonInteraction.NewInstance(feature);\r
                        } else {\r
                                element = TextData.NewInstance(feature);\r