AT: commiting latest changes to the Palm Use data extension and merger

diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
index 36d43095e2b067d31ad98ed8aad709986b3c9c6a..8b302da571b521d4bc46741b8f4e888e1b28bb6e 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-Version: 3.0.9.qualifier
+Bundle-Version: 3.0.10.qualifier
 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 57bfe79e128f66b10fde4da82bb8bcb79c104d6b..875837524ee9acded3e6cbc9b5ed4783502f51dd 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>
-               <version>3.0.9-SNAPSHOT</version>
+               <version>3.0.10-SNAPSHOT</version>
        </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 5899b566428080ed93ef13635950d345d407eaa7..7c9e36732563f1232a93140190b51743779852da 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-Version: 3.0.9.qualifier
+Bundle-Version: 3.0.10.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

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
index 39d3d08a7d53386a8fe0c85fa7c787107bc7a471..dc41b99d4667474615908761b3a37cd9398a2574 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>
-               <version>3.0.9-SNAPSHOT</version>
+               <version>3.0.10-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 4bce4adba1add17fc7d1499a48f0dec859c26a6e..d33912548c13d9deacc2251f2a8a34789f10e051 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.10-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.10-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.10-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.10-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.10-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.10-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.10-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.10-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-3.4.0-SNAPSHOT.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry exported="true" kind="lib" path="lib/activation-1.1.jar" sourcepath="lib/activation-1.1src.zip"/>
@@ -106,14 +115,5 @@
        <classpathentry exported="true" kind="lib" path="lib/xom-1.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/xsltc.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/cdmlib-commons-3.0.9-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.9-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.9-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.9-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.0.9-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.9-SNAPSHOT.jar" sourcepath="lib/cdmlib-persistence-3.0.9-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.9-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.9-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.9-SNAPSHOT.jar" sourcepath="/cdmlib-services"/>
-       <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-envers-3.4.0-SNAPSHOTsrc.zip"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index cad97c4505c31f61338945b886993399a039db54..9ca1c66d01faf7c7fde3e662715688b9cea22d65 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-Version: 3.0.9.qualifier
+Bundle-Version: 3.0.10.qualifier
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -876,12 +876,12 @@ Bundle-ClassPath: .,
  lib/xom-1.0.jar,
  lib/xsltc.jar,
  lib/xstream-1.3.1.jar,
- lib/cdmlib-commons-3.0.9-SNAPSHOT.jar,
- lib/cdmlib-ext-3.0.9-SNAPSHOT.jar,
- lib/cdmlib-io-3.0.9-SNAPSHOT.jar,
- lib/cdmlib-model-3.0.9-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.0.9-SNAPSHOT.jar,
- lib/cdmlib-print-3.0.9-SNAPSHOT.jar,
- lib/cdmlib-remote-3.0.9-SNAPSHOT.jar,
- lib/cdmlib-services-3.0.9-SNAPSHOT.jar,
- lib/hibernate-envers-3.4.0-SNAPSHOT.jar
+ lib/hibernate-envers-3.4.0-SNAPSHOT.jar,
+ lib/cdmlib-commons-3.0.10-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.0.10-SNAPSHOT.jar,
+ lib/cdmlib-io-3.0.10-SNAPSHOT.jar,
+ lib/cdmlib-model-3.0.10-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.0.10-SNAPSHOT.jar,
+ lib/cdmlib-print-3.0.10-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.0.10-SNAPSHOT.jar,
+ lib/cdmlib-services-3.0.10-SNAPSHOT.jar

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 2ec379c35dca95200abf0db0a78c3bd165165efe..7029e7238058fe1f191b3dfeb02c700076ab2376 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -46,7 +46,6 @@ bin.includes = META-INF/,\
                lib/hibernate-annotations-3.4.0-SNAPSHOT.jar,\\r
                lib/hibernate-commons-annotations-3.4.0-SNAPSHOT.jar,\\r
                lib/hibernate-core-3.4.0-SNAPSHOT.jar,\\r
-               lib/hibernate-envers-3.4.0-SNAPSHOT.jar,\\r
                lib/hibernate-search-3.1.0.GA.jar,\\r
                lib/hibernate-tools-3.2.0.ga.jar,\\r
                lib/hibernate-validator-4.0.0.CR1.jar,\\r
@@ -121,15 +120,16 @@ bin.includes = META-INF/,\
                lib/xom-1.0.jar,\\r
                lib/xsltc.jar,\\r
                lib/xstream-1.3.1.jar,\\r
-               lib/cdmlib-commons-3.0.9-SNAPSHOT.jar,\\r
-               lib/cdmlib-ext-3.0.9-SNAPSHOT.jar,\\r
-               lib/cdmlib-io-3.0.9-SNAPSHOT.jar,\\r
-               lib/cdmlib-model-3.0.9-SNAPSHOT.jar,\\r
-               lib/cdmlib-persistence-3.0.9-SNAPSHOT.jar,\\r
-               lib/cdmlib-print-3.0.9-SNAPSHOT.jar,\\r
-               lib/cdmlib-remote-3.0.9-SNAPSHOT.jar,\\r
-               lib/cdmlib-services-3.0.9-SNAPSHOT.jar,\\r
-               lib/poi-3.6.jar\r
+               lib/poi-3.6.jar,\\r
+               lib/hibernate-envers-3.4.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-commons-3.0.10-SNAPSHOT.jar,\\r
+               lib/cdmlib-ext-3.0.10-SNAPSHOT.jar,\\r
+               lib/cdmlib-io-3.0.10-SNAPSHOT.jar,\\r
+               lib/cdmlib-model-3.0.10-SNAPSHOT.jar,\\r
+               lib/cdmlib-persistence-3.0.10-SNAPSHOT.jar,\\r
+               lib/cdmlib-print-3.0.10-SNAPSHOT.jar,\\r
+               lib/cdmlib-remote-3.0.10-SNAPSHOT.jar,\\r
+               lib/cdmlib-services-3.0.10-SNAPSHOT.jar\r
 jars.compile.order = cdmLibrary.jar\r
 src.includes = lib/\r
 jre.compilation.profile = J2SE-1.6\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 55c49e527cb504467e093636d003e4997be676b0..538fe74e1a6dfc6b02c16a3380ef1aec1b0ec565 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
-               <version>3.0.9-SNAPSHOT</version>\r
+               <version>3.0.10-SNAPSHOT</version>\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 a41310e2dcebd41b0706ad5d19e64cb12d39843c..a69d5cfbc4ab2ad8009f660a1cb85cb22b772bb4 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-Version: 3.0.9.qualifier
+Bundle-Version: 3.0.10.qualifier
 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 0fa2ed0af4deb7cc9c3e1021fe400fc30bb60464..8918f66df811923e54909cd6b45d3b5150be931f 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>
-    <version>3.0.9-SNAPSHOT</version>
+    <version>3.0.10-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesViewPart.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesViewPart.java
index cfe3bb91097ebd4ee39eb04ff904844363aa7e63..a98e3e27e3bf017a43fcd842c7f6f0fd540609a0 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesViewPart.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesViewPart.java
@@ -20,6 +20,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;\r
 import org.eclipse.swt.widgets.Menu;\r
 import org.eclipse.swt.widgets.Tree;\r
+import org.eclipse.ui.IEditorInput;\r
 import org.eclipse.ui.IEditorPart;\r
 import org.eclipse.ui.IWorkbenchActionConstants;\r
 import org.eclipse.ui.IWorkbenchPart;\r
@@ -33,6 +34,7 @@ import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;\r
 import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;\r
 import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;\r
+import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;\r
 import eu.etaxonomy.taxeditor.editor.key.AbstractGraphKeyEditor;\r
 import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptionElementDragListener;\r
 import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptionElementDropAdapter;\r
@@ -99,12 +101,27 @@ public class UsesViewPart extends AbstractCdmEditorViewPart implements IPartCont
 //             }\r
        }\r
        \r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.model.AbstractCdmViewPart#getInitialSelection()\r
+        */\r
+       /** {@inheritDoc} */\r
+       @Override\r
+       protected ISelection getInitialSelection() {\r
+               if(getEditor() != null){\r
+                       return new StructuredSelection(getEditor().getEditorInput());\r
+               }       \r
+               \r
+               return super.getInitialSelection();\r
+       }\r
+       \r
        private void createToolbar() {\r
                IToolBarManager toolBarManager = getViewSite().getActionBars().getToolBarManager();\r
                toolBarManager.add(showAllElementsAction);\r
                toolBarManager.add(hideAllElementsAction);\r
        }\r
        \r
+       \r
        private void createMenu(){\r
                MenuManager menuManager = new MenuManager();\r
                menuManager.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));\r
@@ -121,49 +138,7 @@ public class UsesViewPart extends AbstractCdmEditorViewPart implements IPartCont
                control.setMenu(menu);  \r
        }\r
        \r
-       public void changed(Object object) {\r
-               for(FeatureNodeContainerTree containerTree : featureNodeContainerCache.values()){\r
-                       containerTree.buildTree();\r
-               }\r
-               viewer.refresh();\r
-               \r
-               /*if(object instanceof DescriptionElementBase){\r
-                       DescriptionElementBase descriptionElement = (DescriptionElementBase) object;\r
-                       DescriptionBase description = descriptionElement.getInDescription();\r
-                       FeatureNodeContainerTree containerTree = featureNodeContainerCache.get(description);\r
-                       \r
-                       FeatureNodeContainer featureNodeContainer = containerTree.getFeatureNodeContainerForDescriptionElement(descriptionElement);\r
-                       viewer.expandToLevel(featureNodeContainer, 1);\r
-                       \r
-               }*/\r
 \r
-               if(object != null){\r
-                       StructuredSelection selection = new StructuredSelection(object);\r
-                       viewer.setSelection(selection, true);\r
-               }\r
-\r
-               super.changed(object);\r
-       }\r
-       \r
-       \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.taxeditor.model.AbstractCdmViewPart#getInitialSelection()\r
-        */\r
-       /** {@inheritDoc} */\r
-       @Override\r
-       protected ISelection getInitialSelection() {\r
-               if(getEditor() != null){\r
-                       return new StructuredSelection(getEditor().getEditorInput());\r
-               }       \r
-               \r
-               return super.getInitialSelection();\r
-       }\r
-       \r
-       /** {@inheritDoc} */\r
-       @Override\r
-       public boolean postOperation(CdmBase objectAffectedByOperation) {\r
-               return super.postOperation(objectAffectedByOperation);\r
-       }\r
        \r
        @Override\r
        public void selectionChanged(IWorkbenchPart part, ISelection selection) {\r
@@ -182,9 +157,15 @@ public class UsesViewPart extends AbstractCdmEditorViewPart implements IPartCont
                        return;\r
                }\r
                \r
+               if(part instanceof DefinedTermEditor){\r
+                       showEmptyPage();\r
+                       return;\r
+               }\r
+               \r
                if(part instanceof MultiPageTaxonEditor){\r
                        if(! part.equals(this.part)){\r
-                               TaxonEditorInput input = (TaxonEditorInput)((IEditorPart) part).getEditorInput();\r
+                               //TaxonEditorInput input = (TaxonEditorInput)((IEditorPart) part).getEditorInput();\r
+                               IEditorInput input = ((IEditorPart) part).getEditorInput();\r
                                featureNodeContainerCache.clear();\r
                                //showViewer(part, new StructuredSelection(CdmStore.getService(IDescriptionService.class).listTaxonDescriptions(input.getTaxonNode().getTaxon(), null, null, null, null, null, null)));\r
                                showViewer(part, new StructuredSelection(input));\r
@@ -194,10 +175,7 @@ public class UsesViewPart extends AbstractCdmEditorViewPart implements IPartCont
                \r
        }\r
 \r
-       @Override\r
-       public boolean onComplete() {\r
-               return false;\r
-       }\r
+\r
 \r
        /*@Override\r
        public void showViewer(IWorkbenchPart part, IStructuredSelection selection) {\r
@@ -210,10 +188,7 @@ public class UsesViewPart extends AbstractCdmEditorViewPart implements IPartCont
                showViewer();   \r
        }*/\r
        \r
-       @Override\r
-       public Viewer getViewer() {\r
-               return viewer;\r
-       }\r
+       \r
        \r
        private class ToggleDescriptionAction extends Action{\r
                private boolean expanded;\r
@@ -248,7 +223,55 @@ public class UsesViewPart extends AbstractCdmEditorViewPart implements IPartCont
                        setImageAndTooltip();\r
                }\r
        }\r
+       \r
+       /** {@inheritDoc} */\r
+       @Override\r
+       public boolean postOperation(CdmBase objectAffectedByOperation) {\r
+               viewer.refresh();\r
+               return super.postOperation(objectAffectedByOperation);\r
+       }\r
+       \r
+       /** {@inheritDoc} */\r
+       @Override\r
+       public void changed(Object object) {\r
+               for(FeatureNodeContainerTree containerTree : featureNodeContainerCache.values()){\r
+                       containerTree.buildTree();\r
+               }\r
+               viewer.refresh();\r
+               \r
+               if(object instanceof DescriptionElementBase){\r
+                       DescriptionElementBase descriptionElement = (DescriptionElementBase) object;\r
+                       DescriptionBase description = descriptionElement.getInDescription();\r
+                       FeatureNodeContainerTree containerTree = featureNodeContainerCache.get(description);\r
+                       \r
+                       FeatureNodeContainer featureNodeContainer = containerTree.getFeatureNodeContainerForDescriptionElement(descriptionElement);\r
+                       viewer.expandToLevel(featureNodeContainer, 1);\r
+                       \r
+               }\r
+\r
+               if(object != null){\r
+                       StructuredSelection selection = new StructuredSelection(object);\r
+                       viewer.setSelection(selection, true);\r
+               }\r
+\r
+               super.changed(object);\r
+       }\r
+       \r
 \r
+       /** {@inheritDoc} */\r
+       @Override\r
+       public Viewer getViewer() {\r
+               return viewer;\r
+       }\r
        \r
+       /**\r
+        * <p>onComplete</p>\r
+        *\r
+        * @return a boolean.\r
+        */\r
+       @Override\r
+       public boolean onComplete() {\r
+               return false;\r
+       }\r
 \r
 }\r

diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
index c9385f2ada84bfa2107ae6853e5f5f56af4341e8..7c99c9f608dadd50931d6f90eb6e61f42a42fb0c 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="3.0.9.qualifier"
+      version="3.0.10.qualifier"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">

diff --git a/eu.etaxonomy.taxeditor.feature.platform/pom.xml b/eu.etaxonomy.taxeditor.feature.platform/pom.xml
index d93e4c9eaa82b60507161460fe646ed5a29d4ccb..609609db92d991bde868a804436d473bc2550f01 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>
-               <version>3.0.9-SNAPSHOT</version>
+               <version>3.0.10-SNAPSHOT</version>
        </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 67f47fd09544a3e3b3b5eacdf6ebc6cbaa621296..44dbec7650855a3c13ad91854fb158561f27790e 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"
-      version="3.0.9.qualifier"
+      version="3.0.10.qualifier"
       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 5ed560a51745036e046aff036cafe65acd0fba02..4a6c985e4a878e1a7591ffc68d849793f0a5116e 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>
-               <version>3.0.9-SNAPSHOT</version>
+               <version>3.0.10-SNAPSHOT</version>
        </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 90d90577657d6603a293608f184d6279b8ed8da2..df9f792bbb8524389b5600f7fca2f397371c7292 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-Version: 3.0.9.qualifier
+Bundle-Version: 3.0.10.qualifier
 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 3bf87e0121f83f9dd4b67ecef7efa195c92d1d89..4a4569e3e62d7448461dd0fdcac6deab20a0370b 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>
-               <version>3.0.9-SNAPSHOT</version>
+               <version>3.0.10-SNAPSHOT</version>
        </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 8faf9392589b95e63a8f99e46c7dbcf3ebb2c7fb..e0f5bc94062c2b14027912458e8da875233c54cb 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-Version: 3.0.9.qualifier
+Bundle-Version: 3.0.10.qualifier
 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 8731012da13b2bb2dfafe649c8b2bc80d364a515..6c3838bb67051718a7f2c0d75d11c09a6bad0768 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>
-               <version>3.0.9-SNAPSHOT</version>
+               <version>3.0.10-SNAPSHOT</version>
        </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 918ef8f209a400a5526177ad54bd18956fb03578..b0c2eda30f49ff9bfbf33f06626a2aa51928d126 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-Version: 3.0.9.qualifier
+Bundle-Version: 3.0.10.qualifier
 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 93824cdafaa6901ca2ac23c3d4b9dec5530d7cee..338d0e0b6db2d09af6cf2724fe973dd1df689a15 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>
-               <version>3.0.9-SNAPSHOT</version>
+               <version>3.0.10-SNAPSHOT</version>
        </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 160d8fe74bf06852964f487f2be34677019ae211..0e44bb9544c5600b0a6d971097e18b90f2755ef6 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-Version: 3.0.9.qualifier
+Bundle-Version: 3.0.10.qualifier
 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 4543bc06f5b0cc237c4648c82d9a9a85766b1ba5..6256464f05d060be078b5248e503d6ba967d1c75 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>
-       <version>3.0.9-SNAPSHOT</version>
+       <version>3.0.10-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/JaxbExportWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/JaxbExportWizard.java
index d9812712ca23fc5541d9a590c0998dc132d500d0..eada1477bbf3f1db1fe801a6323c8639bded663a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/JaxbExportWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/JaxbExportWizard.java
@@ -11,12 +11,15 @@
 package eu.etaxonomy.taxeditor.io.wizard;
 
 import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IWorkbench;
 
 import eu.etaxonomy.cdm.io.jaxb.JaxbExportConfigurator;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
  * <p>JaxbExportWizard class.</p>
@@ -46,14 +49,17 @@ public class JaxbExportWizard extends AbstractExportWizard<JaxbExportConfigurato
        /** {@inheritDoc} */
        @Override
        public boolean performFinish() {
+               try {
+                       URI urlString = new URI(page.getFolderText() + File.separator + page.getExportFileName());
+                       configurator.setDestination(urlString);
+                       CdmStore.getExportManager().run(configurator);
+                       return true;
+               } catch (URISyntaxException e) {
+                       StoreUtil.error(getClass(), "Could not run JAXB export", e);
+               }
                
-               String urlString = page.getFolderText() + File.separator + page.getExportFileName();
+               return false;
                
-               configurator.setDestination(urlString);
-               
-               CdmStore.getExportManager().run(configurator);
-               
-               return true;
        }
 
        /* (non-Javadoc)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
index 8c5fba40a769d5fac4e06072e863664a1fb79516..17e8eb8e8c7aa2c648ded5fd011eb26c6ca9cd6f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
@@ -139,6 +139,8 @@ public class TermComboElement<T extends DefinedTermBase>
        public void setSelection(T selection) {                 
                this.selection = selection;
                
+               this.selection = selection;
+               
                Listener[] listeners = combo.getListeners(SWT.Selection);
 
                for (Listener listener : listeners) {
@@ -189,9 +191,9 @@ public class TermComboElement<T extends DefinedTermBase>
                        if (label == null) {
                                if (term.getTitleCache() != null) {
                                        label = term.getTitleCache();
-                                       StoreUtil.error(getClass(),
+                                       StoreUtil.warn(getClass(),
                                                        "Term does not have a representation: " + term
-                                                                       + ", " + term.getUuid(), null);
+                                                                       + ", " + term.getUuid());
                                } else {
                                        label = "Unknown";
                                        StoreUtil.error(getClass(),

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java
index ab24fc43c75080288ec89e662a5ac9eb31c47ac4..b7ab20c35476cd8b3a141456596b19a3df32c544 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java
@@ -204,10 +204,9 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
                        }
                        if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
                                combo_language.setTerms(getLanguages());
+                               button.setEnabled(false);
                        }
                        updateControls();
-               }else{
-                       button.setEnabled(false);
                }
        }
 
@@ -223,10 +222,8 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
                element_languageString.setLanguageString(preferredLanguageString);
                if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
                        combo_language.setSelection(preferredLanguageString.getLanguage());
-               }
-               
-               button.setEnabled(true);
-               
+                       button.setEnabled(true);
+               }               
        }
 
        /**

diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
index 0a7289b0af59e9bce4a74476208182171c20f55b..0af0c2d141c943b4af3feb37552bcc5308c65818 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: eu.etaxonomy.taxeditor.test
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.test;singleton:=true
-Bundle-Version: 3.0.9.qualifier
+Bundle-Version: 3.0.10.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: EDIT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/eu.etaxonomy.taxeditor.test/pom.xml b/eu.etaxonomy.taxeditor.test/pom.xml
index b729c76fa0fd401c0918b43a66d0974c5f5e704c..3ddbd3ccd9dfe3496287fbd754050fe1365d8e10 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/pom.xml
+++ b/eu.etaxonomy.taxeditor.test/pom.xml
@@ -4,7 +4,7 @@
        <parent>\r
                <groupId>eu.etaxonomy</groupId>\r
                <artifactId>taxeditor-parent</artifactId>\r
-               <version>3.0.9-SNAPSHOT</version>\r
+               <version>3.0.10-SNAPSHOT</version>\r
        </parent>\r
        <modelVersion>4.0.0</modelVersion>\r
        <artifactId>eu.etaxonomy.taxeditor.test</artifactId>\r

diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
index c7713b424bd6f3d14261d06ae7677cebb95b76ac..709ca7014b4fdd901292916d3bc70913ff389a6c 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"?>
 <?pde version="3.5"?>
 
-<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.9.qualifier" useFeatures="true" includeLaunchers="true">
+<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.10.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
@@ -50,7 +50,7 @@ Software distributed under the License is distributed on an &amp;quot;AS IS&amp;
    </plugins>
 
    <features>
-      <feature id="eu.etaxonomy.taxeditor.feature" version="3.0.9.qualifier"/>
+      <feature id="eu.etaxonomy.taxeditor.feature"/>
    </features>
 
    <configurations>

diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
index afc8b2d614995197fddd1bce0bfc0133d0a14038..f351f7297ef4e848f69f2e770ddaa03fecffd1ce 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>
-               <version>3.0.9-SNAPSHOT</version>
+               <version>3.0.10-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
index 1c0eb8be24a93007d33ba3e57a6ec733cb959d3b..672005895a5d212e036bd8140892e0abe6cc54d5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>3.0.9-SNAPSHOT</version>
+  <version>3.0.10-SNAPSHOT</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for cybertaxonomy</description>
   <url>http://wp5.e-taxonomy.eu</url>
@@ -14,9 +14,9 @@
   <packaging>pom</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.0.9-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>3.0.10-SNAPSHOT</cdmlib.version>
     <tycho.version>0.13.0</tycho.version>
-    <taxeditor.version>3.0.9-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>3.0.10-SNAPSHOT</taxeditor.version>
   </properties>
   <modules>
     <module>eu.etaxonomy.taxeditor.cdmlib</module>