merging in latest changes from trunk, up to r15854 (editor starts without issues)

diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
index 5ec49f46ceb472447a666ff8ec2bed10554a43ef..dbec5dc9d09923b75e37cb23699e8b463a08df0e 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Application
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Application
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true

-Bundle-Version: 3.0.12.qualifier
+Bundle-Version: 3.0.13.qualifier

 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin

diff --git a/eu.etaxonomy.taxeditor.application/pom.xml b/eu.etaxonomy.taxeditor.application/pom.xml
index b70e907c21606778ee2197271396747958a17d3e..9226f9008d452ba1bc50c262c46da22cae791685 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/pom.xml
+++ b/eu.etaxonomy.taxeditor.application/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>

-               <version>3.0.12-SNAPSHOT</version>
+               <version>3.0.13-SNAPSHOT</version>

        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
index da5914383b9282c755e914b24438a54c27ebd801..3e0f83f7786a3e31f4a4e9ad4beb65a4eae4e0a7 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bulkeditor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Bulkeditor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true

-Bundle-Version: 3.0.12.qualifier
+Bundle-Version: 3.0.13.qualifier

 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,eu.etaxonomy.taxeditor.annotatedlineeditor.handler,eu.etaxonomy.taxeditor.bulkeditor,eu.etaxonomy.taxeditor.bulkeditor.command,eu.etaxonomy.taxeditor.bulkeditor.handler,eu.etaxonomy.taxeditor.bulkeditor.input,eu.etaxonomy.taxeditor.bulkeditor.internal,eu.etaxonomy.taxeditor.bulkeditor.referencingobjects
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,eu.etaxonomy.taxeditor.annotatedlineeditor.handler,eu.etaxonomy.taxeditor.bulkeditor,eu.etaxonomy.taxeditor.bulkeditor.command,eu.etaxonomy.taxeditor.bulkeditor.handler,eu.etaxonomy.taxeditor.bulkeditor.input,eu.etaxonomy.taxeditor.bulkeditor.internal,eu.etaxonomy.taxeditor.bulkeditor.referencingobjects

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
index db7b958d0176da9fbc5c7ea95ea1231d61c0978c..331178b9a052fd1f8de7915e4eab18ace5ff0da6 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>

-               <version>3.0.12-SNAPSHOT</version>
+               <version>3.0.13-SNAPSHOT</version>

        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index af0efc67df166667c4bce46d7e1a60695ebbf587..02f3ef81eb301f37ee6db4a4d7b53afd02f9056b 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -108,13 +108,21 @@
        <classpathentry exported="true" kind="lib" path="lib/xstream-1.3.1.jar" sourcepath="lib/xstream-1.3.1src.zip"/>
        <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-envers-3.4.0-SNAPSHOTsrc.zip"/>
        <classpathentry exported="true" kind="lib" path="lib/spring-xml-1.5.6.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/xstream-1.3.1.jar" sourcepath="lib/xstream-1.3.1src.zip"/>
        <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-envers-3.4.0-SNAPSHOTsrc.zip"/>
        <classpathentry exported="true" kind="lib" path="lib/spring-xml-1.5.6.jar"/>

-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry kind="output" path="target/classes"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.13-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.13-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.13-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.13-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.13-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.13-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.13-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.13-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.13-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.13-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.13-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.13-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.13-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.13-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.13-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.13-SNAPSHOT.jar"/>
+       <classpathentry kind="output" path="bin"/>

 </classpath>
 </classpath>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 7ccdcee89d4790832049f03881c12454a5bea11e..213d960c1b3f1d31fd7dae076fa88df440733d02 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDM Library Dependencies Plugin
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: CDM Library Dependencies Plugin
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true

-Bundle-Version: 3.0.12.qualifier
+Bundle-Version: 3.0.13.qualifier

 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,


@@ -878,11 +878,19 @@ Bundle-ClassPath: .,
  lib/xstream-1.3.1.jar,
  lib/hibernate-envers-3.4.0-SNAPSHOT.jar,
  lib/spring-xml-1.5.6.jar,
  lib/xstream-1.3.1.jar,
  lib/hibernate-envers-3.4.0-SNAPSHOT.jar,
  lib/spring-xml-1.5.6.jar,

- lib/cdmlib-commons-3.0.12-SNAPSHOT.jar,
- lib/cdmlib-ext-3.0.12-SNAPSHOT.jar,
- lib/cdmlib-io-3.0.12-SNAPSHOT.jar,
- lib/cdmlib-model-3.0.12-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.0.12-SNAPSHOT.jar,
- lib/cdmlib-print-3.0.12-SNAPSHOT.jar,
- lib/cdmlib-remote-3.0.12-SNAPSHOT.jar,
- lib/cdmlib-services-3.0.12-SNAPSHOT.jar
+ lib/cdmlib-commons-3.0.13-SNAPSHOT-sources.jar,
+ lib/cdmlib-commons-3.0.13-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.0.13-SNAPSHOT-sources.jar,
+ lib/cdmlib-ext-3.0.13-SNAPSHOT.jar,
+ lib/cdmlib-io-3.0.13-SNAPSHOT-sources.jar,
+ lib/cdmlib-io-3.0.13-SNAPSHOT.jar,
+ lib/cdmlib-model-3.0.13-SNAPSHOT-sources.jar,
+ lib/cdmlib-model-3.0.13-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.0.13-SNAPSHOT-sources.jar,
+ lib/cdmlib-persistence-3.0.13-SNAPSHOT.jar,
+ lib/cdmlib-print-3.0.13-SNAPSHOT-sources.jar,
+ lib/cdmlib-print-3.0.13-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.0.13-SNAPSHOT-sources.jar,
+ lib/cdmlib-remote-3.0.13-SNAPSHOT.jar,
+ lib/cdmlib-services-3.0.13-SNAPSHOT-sources.jar,
+ lib/cdmlib-services-3.0.13-SNAPSHOT.jar

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 425f3b3205607be5aee24472e6c82218b7b58c27..0338fa88cebe91920f7a64851ed442d4199d0115 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -121,14 +121,22 @@ bin.includes = META-INF/,\
                lib/poi-3.6.jar,\\r
                lib/hibernate-envers-3.4.0-SNAPSHOT.jar,\\r
                lib/spring-xml-1.5.6.jar,\\r
                lib/poi-3.6.jar,\\r
                lib/hibernate-envers-3.4.0-SNAPSHOT.jar,\\r
                lib/spring-xml-1.5.6.jar,\\r

-               lib/cdmlib-commons-3.0.12-SNAPSHOT.jar,\\r
-               lib/cdmlib-ext-3.0.12-SNAPSHOT.jar,\\r
-               lib/cdmlib-io-3.0.12-SNAPSHOT.jar,\\r
-               lib/cdmlib-model-3.0.12-SNAPSHOT.jar,\\r
-               lib/cdmlib-persistence-3.0.12-SNAPSHOT.jar,\\r
-               lib/cdmlib-print-3.0.12-SNAPSHOT.jar,\\r
-               lib/cdmlib-remote-3.0.12-SNAPSHOT.jar,\\r
-               lib/cdmlib-services-3.0.12-SNAPSHOT.jar\r
+               lib/cdmlib-commons-3.0.13-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-commons-3.0.13-SNAPSHOT.jar,\\r
+               lib/cdmlib-ext-3.0.13-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-ext-3.0.13-SNAPSHOT.jar,\\r
+               lib/cdmlib-io-3.0.13-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-io-3.0.13-SNAPSHOT.jar,\\r
+               lib/cdmlib-model-3.0.13-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-model-3.0.13-SNAPSHOT.jar,\\r
+               lib/cdmlib-persistence-3.0.13-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-persistence-3.0.13-SNAPSHOT.jar,\\r
+               lib/cdmlib-print-3.0.13-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-print-3.0.13-SNAPSHOT.jar,\\r
+               lib/cdmlib-remote-3.0.13-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-remote-3.0.13-SNAPSHOT.jar,\\r
+               lib/cdmlib-services-3.0.13-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-services-3.0.13-SNAPSHOT.jar\r

 jars.compile.order = cdmLibrary.jar\r
 src.includes = lib/\r
 bin.excludes = lib/activation-1.1src.zip,\\r
 jars.compile.order = cdmLibrary.jar\r
 src.includes = lib/\r
 bin.excludes = lib/activation-1.1src.zip,\\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 13c544b1182e063880bea1b3a26551d7468eda70..f0b19015779f7d707ff83873b4ecf1c2ec38166c 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -3,7 +3,7 @@
        <parent>\r
                <groupId>eu.etaxonomy</groupId>\r
                <artifactId>taxeditor-parent</artifactId>\r
        <parent>\r
                <groupId>eu.etaxonomy</groupId>\r
                <artifactId>taxeditor-parent</artifactId>\r

-               <version>3.0.12-SNAPSHOT</version>\r
+               <version>3.0.13-SNAPSHOT</version>\r

        </parent>\r
        <modelVersion>4.0.0</modelVersion>\r
        <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
        </parent>\r
        <modelVersion>4.0.0</modelVersion>\r
        <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r

diff --git a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
index 65af273551cd1ad26209008134461bd953c30a59..d6a5875ca5ec93436df12a4210ac81684f716ea6 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true

-Bundle-Version: 3.0.12.qualifier
+Bundle-Version: 3.0.13.qualifier

 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin

diff --git a/eu.etaxonomy.taxeditor.editor/pom.xml b/eu.etaxonomy.taxeditor.editor/pom.xml
index 044ef40a5d74dc709e2a9611faaf74d6a72d562b..bb22d5ccee6dcee47f14d1eddac7eef990ffeb91 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/pom.xml
+++ b/eu.etaxonomy.taxeditor.editor/pom.xml
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>

-    <version>3.0.12-SNAPSHOT</version>
+    <version>3.0.13-SNAPSHOT</version>

   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>

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 d9940520b63b9eee55840f703c8ebe3b23ecc49e..b4dafb7e7374874d2f83fd4509c3893e446600f8 100644 (file)
--- 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
@@ -38,6 +38,8 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @version 1.0\r
  */\r
 public class UseObjectManager extends ContextListenerAdapter{\r
  * @version 1.0\r
  */\r
 public class UseObjectManager extends ContextListenerAdapter{\r

+       \r
+       \r

        @Override\r
        public void contextRefresh(IProgressMonitor monitor) {\r
                monitor.subTask("Refreshing the Uses View");\r
        @Override\r
        public void contextRefresh(IProgressMonitor monitor) {\r
                monitor.subTask("Refreshing the Uses View");\r


@@ -54,60 +56,99 @@ public class UseObjectManager extends ContextListenerAdapter{
        }\r
        \r
        private void setupNecessaryItems(IProgressMonitor monitor) {\r
        }\r
        \r
        private void setupNecessaryItems(IProgressMonitor monitor) {\r

-               MarkerType existingMarkertype = (MarkerType) CdmStore.getService(ITermService.class).find(UsageTermCollection.uuidUseMarkerType);\r
-               TermVocabulary<State> stateVocabulary =  (TermVocabulary<State>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidUseCategoryVocabulary);\r
+               \r
+               //retrieve terms and vocabularies from db\r

                Feature featureUseRecord = (Feature) CdmStore.getService(ITermService.class).find(UsageTermCollection.uuidUseRecordFeature);\r
                Feature featureUseSummary = (Feature) CdmStore.getService(ITermService.class).find(UsageTermCollection.uuidUseSummaryFeature);\r
                Feature featureUseRecord = (Feature) CdmStore.getService(ITermService.class).find(UsageTermCollection.uuidUseRecordFeature);\r
                Feature featureUseSummary = (Feature) CdmStore.getService(ITermService.class).find(UsageTermCollection.uuidUseSummaryFeature);\r

-               TermVocabulary<Modifier> countryVocabulary =  (TermVocabulary<Modifier>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidCountryVocabulary);\r
-               TermVocabulary<Modifier> plantPartVocabulary =  (TermVocabulary<Modifier>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidPlantPartVocabulary);\r
-               TermVocabulary<Modifier> humanGroupVocabulary =  (TermVocabulary<Modifier>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidHumanGroupVocabulary);\r

                \r
                ConversationHolder conversation = CdmStore.createConversation();\r
                \r
                ConversationHolder conversation = CdmStore.createConversation();\r

-               if (existingMarkertype == null) {\r
-                       existingMarkertype = MarkerType.NewInstance(UsageTermCollection.useMakerLabel, UsageTermCollection.useMakerLabel, null);\r
-                       existingMarkertype.setUuid( UsageTermCollection.uuidUseMarkerType);\r
-                       TermVocabulary<MarkerType> markerTypeVocabulary = (TermVocabulary<MarkerType>)CdmStore.getService(IVocabularyService.class).find((UsageTermCollection.uuidMarkersVocabulary));\r
-                       markerTypeVocabulary.addTerm(existingMarkertype);\r
-                       CdmStore.getService(IVocabularyService.class).saveOrUpdate(markerTypeVocabulary);\r
-                       conversation.commit(true);\r
-               }\r
-               if (stateVocabulary == null) {\r
-                       monitor.subTask("stateVocabulary empty");\r
-                       URI termSourceUri = null;\r
-                       try {\r
-                               termSourceUri = new URI("eu.etaxonomy.cdm.model.description.State");\r
-                       } catch (URISyntaxException e) {\r
-                               e.printStackTrace();\r
+               \r
+               \r
+               //create use marker type if not exists\r
+               createUseMarkerType(conversation);\r
+               \r
+               //create state vocabulary if not exists\r
+               createStateVocabulary(monitor, conversation);\r
+                       \r
+               //create state vocabulary if not exists\r
+               createCountryVocabulary(monitor, conversation);\r
+               \r
+               //create plant part vocabulary\r
+               createPlantVocabulary(monitor, conversation);\r
+               \r
+               //create human group vocabulary\r
+               createHumanGroupVocabulary(monitor, conversation);\r
+               \r
+               if(featureUseRecord == null || featureUseSummary == null) {\r
+                       TermVocabulary<Feature> featureVocabulary = (TermVocabulary<Feature>)CdmStore.getService(IVocabularyService.class).find((UsageTermCollection.uuidFeatureVocabulary));\r
+                       FeatureTree palmWebFeatureTree = CdmStore.getService(IFeatureTreeService.class).find(UsageTermCollection.uuidPalmWebFeatureTree);\r
+                       \r
+                       if (featureUseRecord == null ) {\r
+                               featureUseRecord = Feature.NewInstance(UsageTermCollection.useRecordFeatureLabel, UsageTermCollection.useRecordFeatureLabel, null);\r
+                               featureUseRecord.setUuid(UsageTermCollection.uuidUseRecordFeature);\r
+                               featureUseRecord.isSupportsCategoricalData();\r
+                               featureUseRecord.setSupportsCategoricalData(true);\r
+                               featureVocabulary.addTerm(featureUseRecord);\r
+                               if (palmWebFeatureTree != null){\r
+                                       FeatureNode useRecFeatureNode = FeatureNode.NewInstance(featureUseRecord);\r
+                                       palmWebFeatureTree.getRoot().addChild(useRecFeatureNode);\r
+                               }else{\r
+                                       StoreUtil.warn(getClass(), "No current feature tree available to add useRecord feature");\r
+                               }\r
+                       }\r
+                       if (featureUseSummary == null) {\r
+                               featureUseSummary = Feature.NewInstance(UsageTermCollection.useSummaryFeatureLabel, UsageTermCollection.useSummaryFeatureLabel, null);\r
+                               featureUseSummary.setUuid(UsageTermCollection.uuidUseSummaryFeature);\r
+                               featureUseSummary.isSupportsTextData();\r
+                               featureUseSummary.setSupportsTextData(true);\r
+                               featureVocabulary.addTerm(featureUseSummary);\r
+                               if (palmWebFeatureTree != null){\r
+                                       FeatureNode useSumFeatureNode = FeatureNode.NewInstance(featureUseSummary);\r
+                                       palmWebFeatureTree.getRoot().addChild(useSumFeatureNode);\r
+                               }else{\r
+                                       StoreUtil.warn(getClass(), "No current feature tree available to add use summary feature");\r
+                               }\r
+                       }\r
+                       \r
+                       CdmStore.getService(IVocabularyService.class).saveOrUpdate(featureVocabulary);\r
+                       if (palmWebFeatureTree != null){\r
+                               CdmStore.getService(IFeatureTreeService.class).saveOrUpdate(palmWebFeatureTree);\r

                        }\r
                        }\r

-                       stateVocabulary = TermVocabulary.NewInstance(UsageTermCollection.useCategoryVocabularyLabel, UsageTermCollection.useCategoryVocabularyLabel, null, termSourceUri);\r
-                       stateVocabulary.setUuid(UsageTermCollection.uuidUseCategoryVocabulary);\r
-                       State newDummyState = State.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r
-                       newDummyState.setUuid(UsageTermCollection.uuidUseCategoryDummy);\r
-                       State newDummySubCat = State.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r
-                       newDummySubCat.setUuid(UsageTermCollection.uuidUseSubCategoryDummy);\r
-                       newDummyState.addIncludes(newDummySubCat);\r
-                       stateVocabulary.addTerm(newDummyState);\r
-                       CdmStore.getService(IVocabularyService.class).saveOrUpdate(stateVocabulary);\r

                        conversation.commit(true);\r
                        conversation.commit(true);\r

+                       \r

                }\r
                }\r

-               if (countryVocabulary == null) {\r
-                       monitor.subTask("countryVocabulary empty");\r
+               conversation.close();   \r
+       }\r
+\r
+\r
+       private void createHumanGroupVocabulary(IProgressMonitor monitor,ConversationHolder conversation) {\r
+               TermVocabulary<Modifier> humanGroupVocabulary =  (TermVocabulary<Modifier>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidHumanGroupVocabulary);\r
+               if (humanGroupVocabulary == null){\r
+                       monitor.subTask("create human group vocabulary");\r

                        URI termSourceUri = null;\r
                        try {\r
                                termSourceUri = new URI("eu.etaxonomy.cdm.model.description.Modifier");\r
                        } catch (URISyntaxException e) {\r
                                e.printStackTrace();\r
                        }\r
                        URI termSourceUri = null;\r
                        try {\r
                                termSourceUri = new URI("eu.etaxonomy.cdm.model.description.Modifier");\r
                        } catch (URISyntaxException e) {\r
                                e.printStackTrace();\r
                        }\r

-                       countryVocabulary = TermVocabulary.NewInstance(UsageTermCollection.countryLabel, UsageTermCollection.countryLabel, null, termSourceUri);\r
-                       countryVocabulary.setUuid(UsageTermCollection.uuidCountryVocabulary);\r
+                       humanGroupVocabulary = TermVocabulary.NewInstance(UsageTermCollection.humanGroupLabel, UsageTermCollection.humanGroupLabel, null, termSourceUri);\r
+                       humanGroupVocabulary.setUuid(UsageTermCollection.uuidHumanGroupVocabulary);\r

                        Modifier newDummyModifier = Modifier.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r
                        Modifier newDummyModifier = Modifier.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r

-                       newDummyModifier.setUuid(UsageTermCollection.uuidCountryDummy);\r
-                       countryVocabulary.addTerm(newDummyModifier);\r
-                       CdmStore.getService(IVocabularyService.class).saveOrUpdate(countryVocabulary);\r
+                       newDummyModifier.setUuid(UsageTermCollection.uuidHumanGroupDummy);\r
+                       Modifier newSubDummyModifier = Modifier.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r
+                       newSubDummyModifier.setUuid(UsageTermCollection.uuidEthnicGroupDummy);\r
+                       newDummyModifier.addIncludes(newSubDummyModifier);\r
+                       humanGroupVocabulary.addTerm(newDummyModifier);\r
+                       CdmStore.getService(IVocabularyService.class).saveOrUpdate(humanGroupVocabulary);\r

                        conversation.commit(true);\r
                }\r
                        conversation.commit(true);\r
                }\r

-               if (plantPartVocabulary == null) {\r
-                       monitor.subTask("plantPartVocabulary empty");\r
+       }\r
+\r
+\r
+       private void createPlantVocabulary(IProgressMonitor monitor, ConversationHolder conversation) {\r
+               TermVocabulary<Modifier> plantPartVocabulary =  (TermVocabulary<Modifier>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidPlantPartVocabulary);\r
+               if (plantPartVocabulary == null){\r
+                       monitor.subTask("create plant part vocabulary");\r

                        URI termSourceUri = null;\r
                        try {\r
                                termSourceUri = new URI("eu.etaxonomy.cdm.model.description.Modifier");\r
                        URI termSourceUri = null;\r
                        try {\r
                                termSourceUri = new URI("eu.etaxonomy.cdm.model.description.Modifier");\r


@@ -122,54 +163,63 @@ public class UseObjectManager extends ContextListenerAdapter{
                        CdmStore.getService(IVocabularyService.class).saveOrUpdate(plantPartVocabulary);\r
                        conversation.commit(true);\r
                }\r
                        CdmStore.getService(IVocabularyService.class).saveOrUpdate(plantPartVocabulary);\r
                        conversation.commit(true);\r
                }\r

-               if (humanGroupVocabulary == null) {\r
-                       monitor.subTask("humanGroupVocabulary empty");\r
+       }\r
+\r
+\r
+       private void createCountryVocabulary(IProgressMonitor monitor, ConversationHolder conversation) {\r
+               TermVocabulary<Modifier> countryVocabulary =  (TermVocabulary<Modifier>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidCountryVocabulary);\r
+               if (countryVocabulary == null){\r
+                       monitor.subTask("create country vocabulary");\r

                        URI termSourceUri = null;\r
                        try {\r
                                termSourceUri = new URI("eu.etaxonomy.cdm.model.description.Modifier");\r
                        } catch (URISyntaxException e) {\r
                                e.printStackTrace();\r
                        }\r
                        URI termSourceUri = null;\r
                        try {\r
                                termSourceUri = new URI("eu.etaxonomy.cdm.model.description.Modifier");\r
                        } catch (URISyntaxException e) {\r
                                e.printStackTrace();\r
                        }\r

-                       humanGroupVocabulary = TermVocabulary.NewInstance(UsageTermCollection.humanGroupLabel, UsageTermCollection.humanGroupLabel, null, termSourceUri);\r
-                       humanGroupVocabulary.setUuid(UsageTermCollection.uuidHumanGroupVocabulary);\r
+                       countryVocabulary = TermVocabulary.NewInstance(UsageTermCollection.countryLabel, UsageTermCollection.countryLabel, null, termSourceUri);\r
+                       countryVocabulary.setUuid(UsageTermCollection.uuidCountryVocabulary);\r

                        Modifier newDummyModifier = Modifier.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r
                        Modifier newDummyModifier = Modifier.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r

-                       newDummyModifier.setUuid(UsageTermCollection.uuidHumanGroupDummy);\r
-                       Modifier newSubDummyModifier = Modifier.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r
-                       newSubDummyModifier.setUuid(UsageTermCollection.uuidEthnicGroupDummy);\r
-                       newDummyModifier.addIncludes(newSubDummyModifier);\r
-                       humanGroupVocabulary.addTerm(newDummyModifier);\r
-                       CdmStore.getService(IVocabularyService.class).saveOrUpdate(humanGroupVocabulary);\r
+                       newDummyModifier.setUuid(UsageTermCollection.uuidCountryDummy);\r
+                       countryVocabulary.addTerm(newDummyModifier);\r
+                       CdmStore.getService(IVocabularyService.class).saveOrUpdate(countryVocabulary);\r

                        conversation.commit(true);\r
                }\r
                        conversation.commit(true);\r
                }\r

-               \r
-               if(featureUseRecord == null|| featureUseSummary == null) {\r
-                       TermVocabulary<Feature> featureVocabulary = (TermVocabulary<Feature>)CdmStore.getService(IVocabularyService.class).find((UsageTermCollection.uuidFeatureVocabulary));\r
-                       FeatureTree palmWebFeatureTree = CdmStore.getService(IFeatureTreeService.class).find(UsageTermCollection.uuidPalmWebFeatureTree);\r
-                       \r
-                       if (featureUseRecord == null ) {\r
-                               featureUseRecord = Feature.NewInstance(UsageTermCollection.useRecordFeatureLabel, UsageTermCollection.useRecordFeatureLabel, null);\r
-                               featureUseRecord.setUuid(UsageTermCollection.uuidUseRecordFeature);\r
-                               featureUseRecord.isSupportsCategoricalData();\r
-                               featureUseRecord.setSupportsCategoricalData(true);\r
-                               featureVocabulary.addTerm(featureUseRecord);\r
-                               FeatureNode useRecFeatureNode = FeatureNode.NewInstance(featureUseRecord);\r
-                               palmWebFeatureTree.getRoot().addChild(useRecFeatureNode);\r
-                       }\r
-                       if (featureUseSummary == null) {\r
-                               featureUseSummary = Feature.NewInstance(UsageTermCollection.useSummaryFeatureLabel, UsageTermCollection.useSummaryFeatureLabel, null);\r
-                               featureUseSummary.setUuid(UsageTermCollection.uuidUseSummaryFeature);\r
-                               featureUseSummary.isSupportsTextData();\r
-                               featureUseSummary.setSupportsTextData(true);\r
-                               featureVocabulary.addTerm(featureUseSummary);\r
-                               FeatureNode useSumFeatureNode = FeatureNode.NewInstance(featureUseSummary);\r
-                               palmWebFeatureTree.getRoot().addChild(useSumFeatureNode);\r
+       }\r
+\r
+\r
+       private void createStateVocabulary(IProgressMonitor monitor, ConversationHolder conversation) {\r
+               TermVocabulary<State> stateVocabulary =  (TermVocabulary<State>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidUseCategoryVocabulary);\r
+               if (stateVocabulary == null){\r
+                       monitor.subTask("create state vocabulary");\r
+                       URI termSourceUri = null;\r
+                       try {\r
+                               termSourceUri = new URI("eu.etaxonomy.cdm.model.description.State");\r
+                       } catch (URISyntaxException e) {\r
+                               e.printStackTrace();\r

                        }\r
                        }\r

-                       \r
-                       CdmStore.getService(IVocabularyService.class).saveOrUpdate(featureVocabulary);\r
-                       CdmStore.getService(IFeatureTreeService.class).saveOrUpdate(palmWebFeatureTree);\r
+                       stateVocabulary = TermVocabulary.NewInstance(UsageTermCollection.useCategoryVocabularyLabel, UsageTermCollection.useCategoryVocabularyLabel, null, termSourceUri);\r
+                       stateVocabulary.setUuid(UsageTermCollection.uuidUseCategoryVocabulary);\r
+                       State newDummyState = State.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r
+                       newDummyState.setUuid(UsageTermCollection.uuidUseCategoryDummy);\r
+                       State newDummySubCat = State.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r
+                       newDummySubCat.setUuid(UsageTermCollection.uuidUseSubCategoryDummy);\r
+                       newDummyState.addIncludes(newDummySubCat);\r
+                       stateVocabulary.addTerm(newDummyState);\r
+                       CdmStore.getService(IVocabularyService.class).saveOrUpdate(stateVocabulary);\r
+                       conversation.commit(true);\r
+               }\r
+       }\r
+\r
+\r
+       private void createUseMarkerType(ConversationHolder conversation) {\r
+               MarkerType useMarkertype = (MarkerType) CdmStore.getService(ITermService.class).find(UsageTermCollection.uuidUseMarkerType);\r
+               if (useMarkertype == null){\r
+                       useMarkertype = MarkerType.NewInstance(UsageTermCollection.useMakerLabel, UsageTermCollection.useMakerLabel, null);\r
+                       useMarkertype.setUuid( UsageTermCollection.uuidUseMarkerType);\r
+                       TermVocabulary<MarkerType> markerTypeVocabulary = (TermVocabulary<MarkerType>)CdmStore.getService(IVocabularyService.class).find((UsageTermCollection.uuidMarkersVocabulary));\r
+                       markerTypeVocabulary.addTerm(useMarkertype);\r
+                       CdmStore.getService(IVocabularyService.class).saveOrUpdate(markerTypeVocabulary);\r

                        conversation.commit(true);\r
                        conversation.commit(true);\r

-                       \r

                }\r
                }\r

-               conversation.close();   \r

        }\r
 }\r
        }\r
 }\r

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java
index 2d4261bfaf4ae66cf87e52b6375b8b8469e9f3b7..648e35a6aa197b55afbec8f72d96caa9cd9073da 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java
@@ -41,8 +41,9 @@ public class TaxeditorEditorPlugin extends AbstractUIPlugin {
                super.start(context);
                
                EditorStateManager stateManager = new EditorStateManager();
                super.start(context);
                
                EditorStateManager stateManager = new EditorStateManager();

-               UseObjectManager useManager = new UseObjectManager();

                CdmStore.getContextManager().addContextListener(stateManager);
                CdmStore.getContextManager().addContextListener(stateManager);

+               
+               UseObjectManager useManager = new UseObjectManager();

                CdmStore.getContextManager().addContextListener(useManager);
                
                plugin = this;
                CdmStore.getContextManager().addContextListener(useManager);
                
                plugin = this;

diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
index 943b7de6d208aa334e747baf34b3a2699f66d960..9bd198d4ad268e8d0fc0dedf8c9d74feaf6ce1c6 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
@@ -1,933 +1,926 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<feature\r
-      id="eu.etaxonomy.taxeditor.feature.platform"\r
-      label="Taxeditor Dependencies"\r
-      version="3.0.12.qualifier"\r
-      os="linux,macosx,win32"\r
-      ws="cocoa,gtk,win32"\r
-      arch="x86,x86_64">\r
-\r
-   <license url="http://www.eclipse.org/legal/epl-v10.html">\r
-      The contents of this file are subject to the Eclipse Public License Version 1.0 (the &quot;License&quot;); you may not use this file except in compliance with the License. You may obtain a copy of the License at\r
-http://www.eclipse.org/legal/epl-v10.html\r
-\r
-Software distributed under the License is distributed on an &quot;AS IS&quot; basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.\r
-   </license>\r
-\r
-   <url>\r
-      <update label="EDIT Taxonomic Editor" url="http://wp5.e-taxonomy.eu/taxeditor/update"/>\r
-   </url>\r
-\r
-   <plugin\r
-         id="com.ibm.icu"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ant.core"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.commands"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.contenttype"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.databinding"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.databinding.beans"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.expressions"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.filebuffers"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.filesystem"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.jobs"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.net"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.resources"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.runtime"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.runtime.compatibility.auth"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.runtime.compatibility.registry"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.variables"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.app"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.common"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.preferences"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.registry"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.security"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.security.macosx"\r
-         os="macosx"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.help"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.jface"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.jface.databinding"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.jface.text"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.osgi"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.osgi.services"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.swt"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.text"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.editors"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.forms"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.ide"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.navigator"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.navigator.resources"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.views"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.views.properties.tabbed"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.workbench"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.workbench.texteditor"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.update.configurator"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.update.core"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.update.ui"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.update.core.win32"\r
-         os="win32"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.filesystem.win32.x86"\r
-         os="win32"\r
-         ws="win32"\r
-         arch="x86"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.net.win32.x86"\r
-         os="win32"\r
-         ws="win32"\r
-         arch="x86"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.resources.win32.x86"\r
-         os="win32"\r
-         arch="x86"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.security.win32.x86"\r
-         os="win32"\r
-         arch="x86"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.swt.win32.win32.x86"\r
-         os="win32"\r
-         ws="win32"\r
-         arch="x86"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.win32"\r
-         os="win32"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.filesystem.linux.x86"\r
-         os="linux"\r
-         arch="x86"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.net.linux.x86"\r
-         os="linux"\r
-         arch="x86"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.launcher.gtk.linux.x86"\r
-         os="linux"\r
-         ws="gtk"\r
-         arch="x86"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.swt.gtk.linux.x86"\r
-         os="linux"\r
-         ws="gtk"\r
-         arch="x86"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.launcher.cocoa.macosx"\r
-         os="macosx"\r
-         ws="cocoa"\r
-         arch="x86"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.launcher.win32.win32.x86"\r
-         os="win32"\r
-         ws="win32"\r
-         arch="x86"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.cocoa"\r
-         os="macosx"\r
-         ws="cocoa"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.databinding.property"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.databinding.observable"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ecf"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ecf.filetransfer"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.compare.core"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ecf.identity"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.launcher"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ecf.provider.filetransfer"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.apache.commons.logging"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.security.ui"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.simpleconfigurator"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"\r
-         os="macosx"\r
-         ws="cocoa"\r
-         arch="x86_64"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.swt.cocoa.macosx.x86_64"\r
-         os="macosx"\r
-         ws="cocoa"\r
-         arch="x86_64"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.filesystem.linux.x86_64"\r
-         os="linux"\r
-         arch="x86_64"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.launcher.gtk.linux.x86_64"\r
-         os="linux"\r
-         ws="gtk"\r
-         arch="x86_64"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.swt.gtk.linux.x86_64"\r
-         os="linux"\r
-         ws="gtk"\r
-         arch="x86_64"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.compare"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ltk.core.refactoring"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ltk.ui.refactoring"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.team.core"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.team.ui"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.ds"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.p2.ui.sdk"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.util"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.p2.core"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.p2.updatechecker"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.p2.operations"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.p2.ui"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.p2.metadata"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.p2.repository"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.p2.director"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.p2.engine"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.p2.artifact.repository"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.sat4j.core"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.sat4j.pb"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.p2.metadata.repository"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.p2.jarprocessor"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.pde.runtime"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.zest.core"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.zest.layouts"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.draw2d"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.views.log"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.filesystem.win32.x86_64"\r
-         os="win32"\r
-         ws="win32"\r
-         arch="x86_64"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.net.win32.x86_64"\r
-         os="win32"\r
-         ws="win32"\r
-         arch="x86_64"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.launcher.win32.win32.x86_64"\r
-         os="win32"\r
-         ws="win32"\r
-         arch="x86_64"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.swt.win32.win32.x86_64"\r
-         os="win32"\r
-         ws="win32"\r
-         arch="x86_64"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.junit"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.jdt.junit.runtime"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="javax.servlet"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.filesystem.macosx"\r
-         os="macosx"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.hamcrest"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.hamcrest.core"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.apache.lucene"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.apache.lucene.analysis"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.help.base"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.help.webapp"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.apache.jasper"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.jsp.jasper.registry"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.http.registry"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.jdt.core"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.hamcrest.text"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.hamcrest.core"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-</feature>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="eu.etaxonomy.taxeditor.feature.platform"
+      label="Taxeditor Dependencies"
+      version="3.0.13.qualifier"
+      os="linux,macosx,win32"
+      ws="cocoa,gtk,win32"
+      arch="x86,x86_64">
+
+   <license url="http://www.eclipse.org/legal/epl-v10.html">
+      The contents of this file are subject to the Eclipse Public License Version 1.0 (the &quot;License&quot;); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+http://www.eclipse.org/legal/epl-v10.html
+
+Software distributed under the License is distributed on an &quot;AS IS&quot; basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
+   </license>
+
+   <url>
+      <update label="EDIT Taxonomic Editor" url="http://wp5.e-taxonomy.eu/taxeditor/update"/>
+   </url>
+
+   <plugin
+         id="com.ibm.icu"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ant.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.commands"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.contenttype"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.databinding"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.databinding.beans"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.expressions"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filebuffers"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filesystem"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.jobs"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.net"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.resources"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.runtime.compatibility.auth"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.runtime.compatibility.registry"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.core.variables"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.app"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.preferences"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.registry"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security.macosx"
+         os="macosx"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.help"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jface"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jface.databinding"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jface.text"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.osgi"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.osgi.services"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.text"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.editors"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.forms"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.ide"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.navigator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.navigator.resources"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.views"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.views.properties.tabbed"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.workbench"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.workbench.texteditor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.update.configurator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.update.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.update.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.update.core.win32"
+         os="win32"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filesystem.win32.x86"
+         os="win32"
+         ws="win32"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.net.win32.x86"
+         os="win32"
+         ws="win32"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.resources.win32.x86"
+         os="win32"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security.win32.x86"
+         os="win32"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt.win32.win32.x86"
+         os="win32"
+         ws="win32"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.win32"
+         os="win32"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filesystem.linux.x86"
+         os="linux"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.net.linux.x86"
+         os="linux"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.launcher.gtk.linux.x86"
+         os="linux"
+         ws="gtk"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.swt.gtk.linux.x86"
+         os="linux"
+         ws="gtk"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.launcher.cocoa.macosx"
+         os="macosx"
+         ws="cocoa"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.launcher.win32.win32.x86"
+         os="win32"
+         ws="win32"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.ui.cocoa"
+         os="macosx"
+         ws="cocoa"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.databinding.property"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.databinding.observable"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.filetransfer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.compare.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.identity"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.launcher"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.provider.filetransfer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.commons.logging"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.simpleconfigurator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"
+         os="macosx"
+         ws="cocoa"
+         arch="x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.swt.cocoa.macosx.x86_64"
+         os="macosx"
+         ws="cocoa"
+         arch="x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filesystem.linux.x86_64"
+         os="linux"
+         arch="x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.launcher.gtk.linux.x86_64"
+         os="linux"
+         ws="gtk"
+         arch="x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.swt.gtk.linux.x86_64"
+         os="linux"
+         ws="gtk"
+         arch="x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.compare"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ltk.core.refactoring"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ltk.ui.refactoring"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.team.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.team.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.ds"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.ui.sdk"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.util"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.updatechecker"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.operations"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.metadata"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.repository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.director"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.engine"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.artifact.repository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.sat4j.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.sat4j.pb"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.metadata.repository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.jarprocessor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.pde.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.zest.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.zest.layouts"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.draw2d"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.views.log"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filesystem.win32.x86_64"
+         os="win32"
+         ws="win32"
+         arch="x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.net.win32.x86_64"
+         os="win32"
+         ws="win32"
+         arch="x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.launcher.win32.win32.x86_64"
+         os="win32"
+         ws="win32"
+         arch="x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.swt.win32.win32.x86_64"
+         os="win32"
+         ws="win32"
+         arch="x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.junit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.jdt.junit.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.servlet"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filesystem.macosx"
+         os="macosx"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.hamcrest"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.hamcrest.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.lucene"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.lucene.analysis"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.help.base"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.help.webapp"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.jasper"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.jsp.jasper.registry"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.http.registry"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jdt.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.hamcrest.text"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

diff --git a/eu.etaxonomy.taxeditor.feature.platform/pom.xml b/eu.etaxonomy.taxeditor.feature.platform/pom.xml
index 0d665cf5af7cf81d1206a6c4989f3f64d55678be..9e32e4f589505904a184a08d25a23b1c0b1eed28 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>

-               <version>3.0.12-SNAPSHOT</version>
+               <version>3.0.13-SNAPSHOT</version>

        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>

diff --git a/eu.etaxonomy.taxeditor.feature/feature.xml b/eu.etaxonomy.taxeditor.feature/feature.xml
index 1518c31385bbfe415ef4dde2d6911d5e18892a1c..7ab92abb08a0c5993a911491e2cd9c942fe5fde7 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"

-      version="3.0.12.qualifier"
+      version="3.0.13.qualifier"

       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"

diff --git a/eu.etaxonomy.taxeditor.feature/pom.xml b/eu.etaxonomy.taxeditor.feature/pom.xml
index 4c8023d7f6054390d2af1a417253e6614f13fda8..793496e7810e5561012f25f8b7d1ef22112de5bd 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>

-               <version>3.0.12-SNAPSHOT</version>
+               <version>3.0.13-SNAPSHOT</version>

        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>

diff --git a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
index 9ccd37e3d87acb84baf7f5d09fd3131df01d34b6..48e42be743b758785e8c68f4744fca81e128691e 100644 (file)
--- a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Help
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Help
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true

-Bundle-Version: 3.0.12.qualifier
+Bundle-Version: 3.0.13.qualifier

 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,

diff --git a/eu.etaxonomy.taxeditor.help/pom.xml b/eu.etaxonomy.taxeditor.help/pom.xml
index dd947da4c8175ee64fe5f3c671ece42d58ff4d72..82e1701d19e743be1d919786ff10d71ac6de3fa8 100644 (file)
--- a/eu.etaxonomy.taxeditor.help/pom.xml
+++ b/eu.etaxonomy.taxeditor.help/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>

-               <version>3.0.12-SNAPSHOT</version>
+               <version>3.0.13-SNAPSHOT</version>

        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
index 740c1909c5693aeae2f111e3da4eac91a9872f61..eacdda6b2437936285032c526ce575b9e705c7cb 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Navigation Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Navigation Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true

-Bundle-Version: 3.0.12.qualifier
+Bundle-Version: 3.0.13.qualifier

 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,

diff --git a/eu.etaxonomy.taxeditor.navigation/pom.xml b/eu.etaxonomy.taxeditor.navigation/pom.xml
index aa33ad597c86ff3e31b4c9f84a87102c16632bf7..e93fecd4b77e70911de80c2ad965f5f52f726d4e 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/pom.xml
+++ b/eu.etaxonomy.taxeditor.navigation/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>

-               <version>3.0.12-SNAPSHOT</version>
+               <version>3.0.13-SNAPSHOT</version>

        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
index 3e55623bbe0e514152e05e21c24845eec2c4f7ec..68fce39e66966e9b89e3a0dc6ff17a8060b46fb2 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Printpublisher Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Printpublisher Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true

-Bundle-Version: 3.0.12.qualifier
+Bundle-Version: 3.0.13.qualifier

 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,

diff --git a/eu.etaxonomy.taxeditor.printpublisher/pom.xml b/eu.etaxonomy.taxeditor.printpublisher/pom.xml
index 633947cfcfa74c105c0966d56ffa5d7b65e8a8b5..05c2fcbfa0891392a06d8517210358c51e1d2794 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/pom.xml
+++ b/eu.etaxonomy.taxeditor.printpublisher/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>

-               <version>3.0.12-SNAPSHOT</version>
+               <version>3.0.13-SNAPSHOT</version>

        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
index f8efcac309b19b35c4659f78caf81e4fd1cb6f1f..4462122ea75823fc91391159b423adac56ec41ef 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true

-Bundle-Version: 3.0.12.qualifier
+Bundle-Version: 3.0.13.qualifier

 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,

diff --git a/eu.etaxonomy.taxeditor.store/pom.xml b/eu.etaxonomy.taxeditor.store/pom.xml
index 40ddc832be3394f88a812ab12f4cb3279ac9033a..1857531f9df0d0ff1f90f7093a8278e778b5b87f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/pom.xml
+++ b/eu.etaxonomy.taxeditor.store/pom.xml
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>

-       <version>3.0.12-SNAPSHOT</version>
+       <version>3.0.13-SNAPSHOT</version>

   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java
index a57cbc7dff8ed3281b55b7e9f169c881257c43da..cf39589ad5b5d0257308742ac2ce10faa265d947 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java
@@ -169,7 +169,14 @@ public class NamedAreaSelectionDialog extends
        /** {@inheritDoc} */
        @Override
        protected String getTitle(NamedArea namedArea) {
        /** {@inheritDoc} */
        @Override
        protected String getTitle(NamedArea namedArea) {

-               return NamedArea.labelWithLevel(namedArea, CdmStore.getDefaultLanguage());
+               try {
+                       String result = NamedArea.labelWithLevel(namedArea, CdmStore.getDefaultLanguage());
+                       return result;
+               } catch (Exception e) {
+                       //TODO still need to learn how errors are handled in the Tax Editor
+                       System.out.println("Error occurred when trying retrieve title for Named Area: " + namedArea.getUuid());
+                       return namedArea.getTitleCache();
+               }

        }
        
        /** {@inheritDoc} */
        }
        
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java
index 4f4e24f5f651787624160966e96b9ab3cbc62f35..f9401eeee53caef77e05d91de846df7f47641399 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java
@@ -10,7 +10,9 @@
 
 package eu.etaxonomy.taxeditor.ui.section.name;
 
 
 package eu.etaxonomy.taxeditor.ui.section.name;
 

+import java.util.ArrayList;

 import java.util.Collection;
 import java.util.Collection;

+import java.util.List;

 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;


@@ -58,9 +60,14 @@ public class ProtologueSection extends AbstractEntityCollectionSection<TaxonName
 
        /** {@inheritDoc} */
        @Override
 
        /** {@inheritDoc} */
        @Override

-       public Collection<DescriptionElementBase> getCollection(
-                       TaxonNameBase entity) {
-               return getTaxonNameDescription(entity).getElements();
+       public Collection<DescriptionElementBase> getCollection(TaxonNameBase entity) {
+               Collection<DescriptionElementBase> result = new ArrayList<DescriptionElementBase>();
+               List<TaxonNameDescription> descriptions = getTaxonNameDescriptions(entity);
+               for (TaxonNameDescription desc : descriptions){
+                       result.addAll(desc.getElements());
+               }
+               return result;
+//OLD: return getTaxonNameDescription(entity).getElements();

        }
 
 
        }
 
 


@@ -80,13 +87,17 @@ public class ProtologueSection extends AbstractEntityCollectionSection<TaxonName
        /** {@inheritDoc} */
        @Override
        public void addElement(DescriptionElementBase element) {
        /** {@inheritDoc} */
        @Override
        public void addElement(DescriptionElementBase element) {

+               //for simplification we always use the first description to add elements here

                getTaxonNameDescription(getEntity()).addElement(element);
        }
 
        /** {@inheritDoc} */
        @Override
        public void removeElement(DescriptionElementBase element) {
                getTaxonNameDescription(getEntity()).addElement(element);
        }
 
        /** {@inheritDoc} */
        @Override
        public void removeElement(DescriptionElementBase element) {

-               getTaxonNameDescription(getEntity()).removeElement(element);
+               List<TaxonNameDescription> descriptions = getTaxonNameDescriptions(getEntity());
+               for (TaxonNameDescription desc : descriptions){
+                       desc.removeElement(element);
+               } 

        }
 
        /** {@inheritDoc} */
        }
 
        /** {@inheritDoc} */


@@ -96,13 +107,33 @@ public class ProtologueSection extends AbstractEntityCollectionSection<TaxonName
                setEntity(name);
        }
        
                setEntity(name);
        }
        

+       /**
+        * NOTE: returns first description
+        * @param name
+        * @return
+        */

        private TaxonNameDescription getTaxonNameDescription(TaxonNameBase name){
        private TaxonNameDescription getTaxonNameDescription(TaxonNameBase name){

-               // FIXME does not handle multiple name descriptions at the moment

                if(name.getDescriptions().size() == 0){
                        name.addDescription(TaxonNameDescription.NewInstance(name));
                }
                return (TaxonNameDescription) name.getDescriptions().iterator().next();
        }
                if(name.getDescriptions().size() == 0){
                        name.addDescription(TaxonNameDescription.NewInstance(name));
                }
                return (TaxonNameDescription) name.getDescriptions().iterator().next();
        }

+       
+       /**
+        * Try to fix FIXME in {@link #getTaxonNameDescription(TaxonNameBase)}
+        * @param name
+        * @return
+        */
+       private List<TaxonNameDescription> getTaxonNameDescriptions(TaxonNameBase<?,?> name){
+               List<TaxonNameDescription> result = new ArrayList<TaxonNameDescription>();
+               if(name.getDescriptions().size() == 0){
+                       name.addDescription(TaxonNameDescription.NewInstance(name));
+               }
+               for (TaxonNameDescription desc : name.getDescriptions()){
+                       result.add(desc);
+               }
+               return result;
+       }

 
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.section.ITaxonDetailSection#getTaxon(eu.etaxonomy.cdm.model.taxon.TaxonBase)
 
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.section.ITaxonDetailSection#getTaxon(eu.etaxonomy.cdm.model.taxon.TaxonBase)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
index 8422ed5d958656970fb44e6c26698f2738505a55..1569bc08eb3467d5abbece97c0e85d93f9f332dd 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
@@ -41,7 +41,7 @@ public class DerivedUnitBaseDetailElement extends
 
        private TextWithLabelElement text_derivedUnitDefinitions;
 
 
        private TextWithLabelElement text_derivedUnitDefinitions;
 

-       private TextWithLabelElement text_accessionNumber;
+       private TextWithLabelElement text_barcode;

 
        private TextWithLabelElement text_catalogNumber;
 
 
        private TextWithLabelElement text_catalogNumber;
 


@@ -82,9 +82,8 @@ public class DerivedUnitBaseDetailElement extends
                // "Specimen Definition",
                // facade.getDerivedUnitDefinition(CdmStore.getDefaultLanguage()),
                // style);
                // "Specimen Definition",
                // facade.getDerivedUnitDefinition(CdmStore.getDefaultLanguage()),
                // style);

-               text_accessionNumber = formFactory.createTextWithLabelElement(
-                               formElement, "Accession Number", entity.getAccessionNumber(),
-                               style);
+               text_barcode = formFactory.createTextWithLabelElement(formElement,
+                               "Barcode", entity.getBarcode(), style);

                text_catalogNumber = formFactory
                                .createTextWithLabelElement(formElement, "Catalog Number",
                                                entity.getCatalogNumber(), style);
                text_catalogNumber = formFactory
                                .createTextWithLabelElement(formElement, "Catalog Number",
                                                entity.getCatalogNumber(), style);


@@ -134,8 +133,8 @@ public class DerivedUnitBaseDetailElement extends
                        getEntity().addDerivedUnitDefinition(
                                        text_derivedUnitDefinitions.getText(),
                                        CdmStore.getDefaultLanguage());
                        getEntity().addDerivedUnitDefinition(
                                        text_derivedUnitDefinitions.getText(),
                                        CdmStore.getDefaultLanguage());

-               } else if (eventSource == text_accessionNumber) {
-                       getEntity().setAccessionNumber(text_accessionNumber.getText());
+               } else if (eventSource == text_barcode) {
+                       getEntity().setBarcode(text_barcode.getText());

                } else if (eventSource == text_catalogNumber) {
                        getEntity().setCatalogNumber(text_catalogNumber.getText());
                } else if (eventSource == combo_preservationMethod) {
                } else if (eventSource == text_catalogNumber) {
                        getEntity().setCatalogNumber(text_catalogNumber.getText());
                } else if (eventSource == combo_preservationMethod) {

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
index 5951b23dbd878800e94853747e7b0ef71896c146..30f43dd00f4dad403647906fbbcb280a36ee594c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
@@ -44,7 +44,7 @@ public class GeneralDetailElement extends
        private EntitySelectionElement<AgentBase> selection_collector;
        private TextWithLabelElement text_collectingNumber;
        private EntitySelectionElement<Collection> selection_collection;
        private EntitySelectionElement<AgentBase> selection_collector;
        private TextWithLabelElement text_collectingNumber;
        private EntitySelectionElement<Collection> selection_collection;

-       private TextWithLabelElement text_barcode;
+       private TextWithLabelElement text_accessionNumber;

 
        /**
         * @param formFactory
 
        /**
         * @param formFactory


@@ -94,8 +94,10 @@ public class GeneralDetailElement extends
                                                getConversationHolder(), formElement, "Collection",
                                                entity.getCollection(),
                                                EntitySelectionElement.ALL, style);
                                                getConversationHolder(), formElement, "Collection",
                                                entity.getCollection(),
                                                EntitySelectionElement.ALL, style);

-               text_barcode = formFactory.createTextWithLabelElement(formElement,
-                               "Barcode", entity.getBarcode(), style);
+               text_accessionNumber = formFactory.createTextWithLabelElement(
+                               formElement, "Accession Number", entity.getAccessionNumber(),
+                               style);
+               

        }
 
        /*
        }
 
        /*


@@ -127,8 +129,8 @@ public class GeneralDetailElement extends
                        getEntity().setFieldNumber(text_collectingNumber.getText());
                } else if (eventSource == selection_collection) {
                        getEntity().setCollection(selection_collection.getSelection());
                        getEntity().setFieldNumber(text_collectingNumber.getText());
                } else if (eventSource == selection_collection) {
                        getEntity().setCollection(selection_collection.getSelection());

-               } else if (eventSource == text_barcode) {
-                       getEntity().setBarcode(text_barcode.getText());
+               } else if (eventSource == text_accessionNumber) {
+                       getEntity().setAccessionNumber(text_accessionNumber.getText());

                }
 
                if (eventSource != toggleableText_titleCache) {
                }
 
                if (eventSource != toggleableText_titleCache) {

diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
index 4a714859db8a73d0b36e42824382e92f453734ad..322cbc32c4049553dcce8ded24c195ceba2487ba 100644 (file)
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
+++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?pde version="3.5"?>\r
 \r
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?pde version="3.5"?>\r
 \r

-<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.0.12.qualifier" useFeatures="true" includeLaunchers="true">\r
+<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.0.13.-SNAPSHOT" useFeatures="true" includeLaunchers="true">\r

 \r
    <aboutInfo>\r
       <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>\r
 \r
    <aboutInfo>\r
       <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>\r

diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
index 73d0bbd110b78879e157f557920d43becad95208..139334f4e2f99ae87830915b7137f0f4727a6055 100644 (file)
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>

-               <version>3.0.12-SNAPSHOT</version>
+               <version>3.0.13-SNAPSHOT</version>

        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>