Merge branch 'hotfix/4.9.2' into develop
authorjenkins <jenkins-int@bgbm.org>
Thu, 10 Aug 2017 11:56:23 +0000 (13:56 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 10 Aug 2017 11:56:23 +0000 (13:56 +0200)
46 files changed:
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.application/pom.xml
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ModelResourceHandler.java
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/pom.xml
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DynamicFeatureMenu.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/DeleteMediaHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/CreateImageOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/RemoveImageFromDescriptionElementOperation.java
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.feature.platform/pom.xml
eu.etaxonomy.taxeditor.feature/feature.xml
eu.etaxonomy.taxeditor.feature/pom.xml
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.help/pom.xml
eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular.lib/pom.xml
eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular/pom.xml
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/pom.xml
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.printpublisher/pom.xml
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/pom.xml
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/DateElementController.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaDetailElement.java
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.test/pom.xml
eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.webapp/pom.xml
eu.etaxonomy.taxeditor.workbench/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.workbench/pom.xml
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
eu.etaxonomy.taxeditor/pom.xml
pom.xml

index 0dd36b015453a21e9322bb11dcd62d667570b055..b84743a3c9370443fcff06dbc751ae1b62cdd2b3 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Application
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 4.9.2
+Bundle-Version: 4.10.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/plugin
index 1d0eebe08108bdca801863ab6fdc8aa25f9bfd2e..10e84f0563c99b17e710c0aa6e751102ed79fff5 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.9.2</version>
+    <version>4.10.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 164caa3226c19ba2b195e423f71664a1d3f11cc3..5067af229b28205f631632346c24fc2974bcbe8e 100644 (file)
@@ -51,6 +51,12 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.osgi.framework.Bundle;
 
 /**
+ * This is a copy of
+ * {@link org.eclipse.e4.ui.internal.workbench.ResourceHandler}. The copy is
+ * registered in the plugin.xml in order to control the loading and saving of
+ * the application model. The only current change is the different save location
+ * (see {@link #getBaseLocation()})
+ *
  * @author pplitzner
  * @date 07.07.2017
  *
index 8b981500023aa75d12793300cd422529e9f0e169..d182e86564aebeb10e3a3b13d16fa6f9fe839953 100644 (file)
@@ -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: 4.9.2
+Bundle-Version: 4.10.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
index 09b59f9cc4682b62e23a2a2280187436e762cac8..97fbd7e9ec217edb2bd3c87edb6cf97214728135 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.9.2</version>
+               <version>4.10.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 4f0b55ddb74fa5de50334b9c53669142e411d23c..5fa85dd2ada006c648692d3602bc96e996fe90ab 100644 (file)
        <classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.8.8.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.8.8.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.9.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.9.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.9.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.9.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.9.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.9.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.9.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.9.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.9.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.10.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.10.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.10.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.10.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.10.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.10.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.10.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.10.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.10.0-SNAPSHOT.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2.jar"/>
index 41e3fe4821551a2c4ee65b0d8a7f1a3c16589bc5..cd3f56121a732df4d05e1c224d80753a669c7ac3 100644 (file)
@@ -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: 4.9.2
+Bundle-Version: 4.10.0.qualifier
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -646,15 +646,15 @@ Bundle-ClassPath: .,
  lib/aspectjrt-1.8.8.jar,
  lib/aspectjweaver-1.8.8.jar,
  lib/batik-xml-1.7.jar,
- lib/cdmlib-commons-4.9.0.jar,
- lib/cdmlib-ext-4.9.0.jar,
- lib/cdmlib-io-4.9.0.jar,
- lib/cdmlib-model-4.9.0.jar,
- lib/cdmlib-persistence-4.9.0.jar,
- lib/cdmlib-print-4.9.0.jar,
- lib/cdmlib-remote-4.9.0.jar,
- lib/cdmlib-services-4.9.0.jar,
- lib/cdmlib-test-4.9.0.jar,
+ lib/cdmlib-commons-4.10.0-SNAPSHOT.jar,
+ lib/cdmlib-ext-4.10.0-SNAPSHOT.jar,
+ lib/cdmlib-io-4.10.0-SNAPSHOT.jar,
+ lib/cdmlib-model-4.10.0-SNAPSHOT.jar,
+ lib/cdmlib-persistence-4.10.0-SNAPSHOT.jar,
+ lib/cdmlib-print-4.10.0-SNAPSHOT.jar,
+ lib/cdmlib-remote-4.10.0-SNAPSHOT.jar,
+ lib/cdmlib-services-4.10.0-SNAPSHOT.jar,
+ lib/cdmlib-test-4.10.0-SNAPSHOT.jar,
  lib/com.springsource.org.aopalliance-1.0.0.jar,
  lib/com.springsource.org.apache.commons.logging-1.1.1.jar,
  lib/commons-beanutils-1.9.2.jar,
index 5572cc458136c8750d31a404771f761e9f1271f4..edfe5b31f1c47b6b42f591eb1bcf0447aae75cbe 100644 (file)
@@ -6,15 +6,15 @@ bin.includes = META-INF/,\
                lib/aspectjrt-1.8.8.jar,\
                lib/aspectjweaver-1.8.8.jar,\
                lib/batik-xml-1.7.jar,\
-               lib/cdmlib-commons-4.9.0.jar,\
-               lib/cdmlib-ext-4.9.0.jar,\
-               lib/cdmlib-io-4.9.0.jar,\
-               lib/cdmlib-model-4.9.0.jar,\
-               lib/cdmlib-persistence-4.9.0.jar,\
-               lib/cdmlib-print-4.9.0.jar,\
-               lib/cdmlib-remote-4.9.0.jar,\
-               lib/cdmlib-services-4.9.0.jar,\
-               lib/cdmlib-test-4.9.0.jar,\
+               lib/cdmlib-commons-4.10.0-SNAPSHOT.jar,\
+               lib/cdmlib-ext-4.10.0-SNAPSHOT.jar,\
+               lib/cdmlib-io-4.10.0-SNAPSHOT.jar,\
+               lib/cdmlib-model-4.10.0-SNAPSHOT.jar,\
+               lib/cdmlib-persistence-4.10.0-SNAPSHOT.jar,\
+               lib/cdmlib-print-4.10.0-SNAPSHOT.jar,\
+               lib/cdmlib-remote-4.10.0-SNAPSHOT.jar,\
+               lib/cdmlib-services-4.10.0-SNAPSHOT.jar,\
+               lib/cdmlib-test-4.10.0-SNAPSHOT.jar,\
                lib/com.springsource.org.aopalliance-1.0.0.jar,\
                lib/com.springsource.org.apache.commons.logging-1.1.1.jar,\
                lib/commons-beanutils-1.9.2.jar,\
index 86214a2a417bf3f6887ee6e6151c1bbde7cbca87..7e9c493b736616619c63f4bd0567a9a7a3c43e3a 100644 (file)
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>4.9.2</version>\r
+    <version>4.10.0-SNAPSHOT</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
index b8ee8b0bf19f2ce6cea286c0cf449dcfaad46f96..0bc5dff0334455abb473eade72c6075627f4e697 100644 (file)
@@ -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: 4.9.2
+Bundle-Version: 4.10.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: OSGI-INF/l10n/plugin
index 29ac5d4f20596a4ed49120c568850e0bc924e89e..e323622b4bfe0fdb6045011f9ed066c58d6a446f 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>4.9.2</version>
+    <version>4.10.0-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
index 98bbdf48ac78f9f0f6bb68aff1878eba6985a730..f9e466e4b515b9ed6d8400b4700916599e0e22ea 100644 (file)
@@ -94,10 +94,15 @@ public class DynamicFeatureMenu extends CompoundContributionItem {
 
                String label = deproxiedFeature.getLabel(PreferencesUtil.getGlobalLanguage());
                if (label == null){
-                       menuItem.setText(deproxiedFeature.getLabel());
-               }else{
-                       menuItem.setText(label);
+                       label = deproxiedFeature.getLabel();
                }
+               if(label == null){
+                   label = deproxiedFeature.generateTitle();
+               }
+               if(label == null){
+                   label = deproxiedFeature.toString();
+               }
+               menuItem.setText(label);
                menuItem.addSelectionListener(new SelectionListener() {
 
                        @Override
index 0043016654970ab9d24da623db01e769cc33dcbd..ce2ed524a0b298a048fa5a5b2536f9922d810f28 100644 (file)
@@ -67,7 +67,7 @@ public class DeleteMediaHandler extends AbstractHandler {
                                }
                                ImageFile image = (ImageFile) paths[0].getLastSegment();
 
-                               AbstractPostOperation operation = null;
+                               AbstractPostOperation<?> operation = null;
                                // TODO use undo context specific to editor
                 MediaDeletionConfigurator config = new MediaDeletionConfigurator();
 
index 2336e69b4feeea26e447b9ae045cf3badca12734..ddea851f8e271b3630a31aa73c5c69abc32d6584 100644 (file)
@@ -27,7 +27,6 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  *
  * @author p.ciardelli
  * @created 31.03.2009
- * @version 1.0
  */
 public class CreateImageOperation extends AbstractPostTaxonOperation {
 
@@ -67,9 +66,6 @@ public class CreateImageOperation extends AbstractPostTaxonOperation {
                this.description = description;
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-        */
        /** {@inheritDoc} */
        @Override
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)
@@ -86,9 +82,6 @@ public class CreateImageOperation extends AbstractPostTaxonOperation {
                return postExecute(imageFile);
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-        */
        /** {@inheritDoc} */
        @Override
        public IStatus redo(IProgressMonitor monitor, IAdaptable info)
@@ -99,9 +92,6 @@ public class CreateImageOperation extends AbstractPostTaxonOperation {
                return postExecute(imageFile);
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-        */
        /** {@inheritDoc} */
        @Override
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)
index b79de0f78c9d3a66f6ae3dc8114bb38a7cf96125..afc550f0fbe9de907ee4629a7dbc31cd24dd1349 100644 (file)
@@ -27,23 +27,20 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @author p.ciardelli
  * @author n.hoffmann
  * @created 05.02.2009
- * @version 1.0
  */
 public class RemoveImageFromDescriptionElementOperation extends AbstractPostTaxonOperation {
 
-       private DescriptionBase element;
+       private DescriptionBase<?> element;
        private Media media;
 
        /**
         * <p>Constructor for RemoveImageFromDescriptionElementOperation.</p>
         *
-        * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
-        * @param taxon a {@link eu.etaxonomy.cdm.model.taxon.Taxon} object.
-        * @param element a {@link eu.etaxonomy.cdm.model.description.DescriptionElementBase} object.
-        * @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
-        * @param label a {@link java.lang.String} object.
-        * @param config
-        * @param image a {@link eu.etaxonomy.cdm.model.media.ImageFile} object.
+        * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object
+        * @param media
+        * @param element a {@link eu.etaxonomy.cdm.model.description.DescriptionElementBase} object
+        * @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object
+        * @param label a {@link java.lang.String} object
         */
        public RemoveImageFromDescriptionElementOperation(String label,
                        IUndoContext undoContext, Media media,
@@ -54,9 +51,6 @@ public class RemoveImageFromDescriptionElementOperation extends AbstractPostTaxo
                this.element = element;
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-        */
        /** {@inheritDoc} */
        @Override
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)
@@ -69,9 +63,6 @@ public class RemoveImageFromDescriptionElementOperation extends AbstractPostTaxo
                return postExecute(element);
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-        */
        /** {@inheritDoc} */
        @Override
        public IStatus redo(IProgressMonitor monitor, IAdaptable info)
@@ -79,9 +70,6 @@ public class RemoveImageFromDescriptionElementOperation extends AbstractPostTaxo
                return execute(monitor, info);
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-        */
        /** {@inheritDoc} */
        @Override
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)
index 4ecf6b91942be3ea72e1b6fed6ec62a6ea597d6a..fc142b30ea48a569fbc426a837957e6d8d529ec3 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="4.9.2"
+      version="4.10.0.qualifier"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
index a65fcb6028bfbdf3f4847e5615f916df319ac332..4ac13142ccb168b5938c6321387da8ea6b0e70dc 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.9.2</version>
+               <version>4.10.0-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
index 2fbce1b99da9f22f0cb7f46ddc995277a0c8ffc2..cb51efd4b1da7e21b7dd63deb8aacbb362838eb3 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="4.9.2"
+      version="4.10.0.qualifier"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
index 4b4ac0b141ffe60211e3fe3e590234c61efe8f4c..6682cf1c8148a5c0845263d49a9a4e1a0478e577 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.9.2</version>
+    <version>4.10.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
index bc90fa7d7c24e3c898b7ac4627c58cdafb6f75f9..b442eaf292d74d9ec7a5bce3a03624b766e35016 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Help
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true
-Bundle-Version: 4.9.2
+Bundle-Version: 4.10.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
index 07570b71ea82b268ceb9c149cd62d20e5fc1c039..b99d0fa0d5d980430007606bfcf99b73b4682a9c 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.9.2</version>
+               <version>4.10.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index bec3430eaead11d3dec515aab76b7723fb7b0962..bdb95d665d96d953b5f7e0e4a974b9cf2e4ebcdc 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: eu.etaxonomy.taxeditor.molecular.lib
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true
-Bundle-Version: 4.9.2
+Bundle-Version: 4.10.0.qualifier
 Bundle-ClassPath: .,
  lib/owlapi-xmlutils-4.1.4.jar,
  lib/commons-collections4-4.1.jar,
index db01a2691cc69627f95f82a50224126679794f5e..678769c48a6f551ad956d43bfc84cb432f280753 100644 (file)
@@ -7,7 +7,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.9.2</version>
+    <version>4.10.0-SNAPSHOT</version>
   </parent>
   
   <name>Molecular Library Dependencies Bundle</name>
index 8c2c12a5e3c6167e0b3bf0f9a4eba59dafddd6f8..d893dcb579c395f784e7a6a6a439094cbc15941b 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Molecular Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular;singleton:=true
-Bundle-Version: 4.9.2
+Bundle-Version: 4.10.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
index 9f78a369da520011f40c5f8a822284ba76ba312e..fc6676b9bc8a6b05c4d9c86087ecbc15aa0b6794 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.9.2</version>
+    <version>4.10.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index b0df060235751529582356f7e993fade871037e9..101ad1d688931b22d01b263c375faa20d3fd15c2 100644 (file)
@@ -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: 4.9.2
+Bundle-Version: 4.10.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
index ad585979d91292d21c7a442f567c489deefb46b0..df26e0997af92bdee01e03808f3278e4038ff31d 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.9.2</version>
+               <version>4.10.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 73c59737b05e2f8f320190c398defb7ec6e1934a..9f5753e9114c074fc7e3cd5e93c99a31617d03bc 100644 (file)
@@ -130,6 +130,7 @@ public class SearchResultView extends ViewPart implements IConversationEnabled{
                // register context menu
                MenuManager menuMgr = new MenuManager();
                menuMgr.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
+               menuMgr.setRemoveAllWhenShown(true);
                getSite().registerContextMenu(menuMgr, resultViewer);
 
                Control control = resultViewer.getControl();
index fa7114784a12e05d916ef2bcd2afcf0aab10ddff..2955f8826c9fcc3ecfed866b62a1806a6e27a69a 100644 (file)
@@ -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: 4.9.2
+Bundle-Version: 4.10.0.qualifier
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,
index c944d467c688be0cd310e1ada35fc121f11d7812..5711caa24c6010ac40310a636a7386234fcafd3b 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>4.9.2</version>
+               <version>4.10.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 6007e5407064fb303bf4c64f977aebbcb8f2191f..24768ea9e3c63bc4560f95297cc7abe35b4e8b59 100644 (file)
@@ -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: 4.9.2
+Bundle-Version: 4.10.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/bundle
index 4541b1f5fd90fef50d01a5bfd566a6ccb3e34e78..96442be92401105b0830d25a440e39793ef7d27c 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>4.9.2</version>
+       <version>4.10.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index c6a7f0d2bded6384b68f1dfc448975e4d0dffde0..7ae8e13d39fca435857ebf4c165fba8babca3e9d 100644 (file)
@@ -81,24 +81,24 @@ public class TermLabelProvider extends StyledCellLabelProvider {
 //    }
 
     public String getText(Object element) {
+        String label = null;
        if(element instanceof TermBase){
                TermBase termBase = (TermBase)element;
                Representation rep = termBase.getRepresentation(PreferencesUtil.getGlobalLanguage());
                if (rep == null){
                        rep = termBase.getPreferredRepresentation(new ArrayList<Language>());
                }
-               String label = rep != null? rep.getLabel() : termBase.getTitleCache();
-               if (element instanceof DefinedTermBase) {
+               label = rep != null? rep.getLabel() : termBase.getTitleCache();
+               if (element instanceof DefinedTermBase && label!=null) {
                        DefinedTermBase<?> dtb = (DefinedTermBase<?>) element;
-                       return CdmUtils.concat(" : ", dtb.getIdInVocabulary(), label);
-
-               } else {
-                       return label;
+                       label = CdmUtils.concat(" : ", dtb.getIdInVocabulary(), label);
                }
        }
-
         // FIXME : must throw an exception here
-        return element.toString();
+       if(label==null){
+           label = element.toString();
+       }
+        return label;
     }
 
     private Styler getVocabularyStyler() {
index 35ae31381dd9c3fd24c973a9cfbbca4164ed8773..c6047dab3bbbf0ffe0958fddf5c3e2f76f3f8d27 100644 (file)
@@ -13,8 +13,6 @@ import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.widgets.Text;
 import org.joda.time.DateTime;
 
-import com.sun.istack.logging.Logger;
-
 import eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;
@@ -39,13 +37,14 @@ public class DateElementController extends AbstractCdmFormElement implements IEn
      * @param initialDateTime
      * @param none
      */
-    public DateElementController(DateElement dateTimeElement, CdmFormFactory formFactory, ICdmFormElement parentElement, DateTime initialDateTime) {
+    public DateElementController(DateElement dateTimeElement, CdmFormFactory formFactory, 
+               ICdmFormElement parentElement, DateTime initialDateTime) {
         super(formFactory, parentElement);
         this.textDate = dateTimeElement.getTextDate();
-       if (initialDateTime != null){
-          this.textDate.setText(initialDateTime.toString("yyyy-MM-dd HH:mm"));
-       }
-       // this.textDate.setText(initialDateTime!=null?initialDateTime.toString("yyyy-MM-dd HH:mm"):null);
+        if (initialDateTime != null){
+               this.textDate.setText(initialDateTime.toString("yyyy-MM-dd HH:mm"));
+        }
+        // this.textDate.setText(initialDateTime!=null?initialDateTime.toString("yyyy-MM-dd HH:mm"):null);
         addControl(textDate);
         dateTime = initialDateTime;
         textDate.addModifyListener(this);
@@ -59,9 +58,7 @@ public class DateElementController extends AbstractCdmFormElement implements IEn
 //        textDate.addModifyListener(this);
 //    }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
-     */
+
     @Override
     public void modifyText(ModifyEvent e) {
         try {
@@ -74,33 +71,23 @@ public class DateElementController extends AbstractCdmFormElement implements IEn
         }
     }
 
-   public DateTime getDateTime(){
+    public DateTime getDateTime(){
         return dateTime;
     } 
-   public void setDateTime(DateTime date){
+    public void setDateTime(DateTime date){
        dateTime = date;
-   } 
+    
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.ui.element.IRelevantFormElement#setIrrelevant(boolean)
-     */
     @Override
     public void setIrrelevant(boolean irrelevant) {
         // TODO Auto-generated method stub
-
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement#setEnabled(boolean)
-     */
     @Override
     public void setEnabled(boolean enabled) {
         textDate.setEnabled(enabled);
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement#isEnabled()
-     */
     @Override
     public boolean isEnabled() {
         return textDate.isEnabled();
index f768b74df31307fc701a12f1de8f7d05cddc3a4d..b081fdc01baa04bd0fd5b1d9c6bf8e10fefdf800 100644 (file)
@@ -29,7 +29,6 @@ import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement;
 /**
  * @author n.hoffmann
  * @created Mar 26, 2010
- * @version 1.0
  */
 public class ImageFileElement extends MediaRepresentationPartElement<ImageFile> {
 
index 06ff8b061ab74c659e39d1f15d29b12c85b9de13..bd6a26c40648075f808adc1daea574d890a651dd 100644 (file)
@@ -18,6 +18,7 @@ import org.eclipse.swt.widgets.Label;
 
 import eu.etaxonomy.cdm.common.UriUtils;
 import eu.etaxonomy.cdm.common.media.ImageInfo;
+import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.media.ImageFile;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.media.MediaRepresentation;
@@ -100,9 +101,10 @@ public class MediaDetailElement extends AbstractCdmDetailElement<Media>{
             UriUtils.getInputStream(uri);// will fail with a FileNotFoundException if not
             imageInfo = ImageInfo.NewInstance(uri, 10000);//will fail when it is no image file
             singleMediaRepresentationPart.setSize((int) imageInfo.getLength());
-            if(singleMediaRepresentationPart instanceof ImageFile){
-                ((ImageFile) singleMediaRepresentationPart).setHeight(imageInfo.getHeight());
-                ((ImageFile) singleMediaRepresentationPart).setWidth(imageInfo.getWidth());
+            if(singleMediaRepresentationPart.isInstanceOf(ImageFile.class)){
+               ImageFile image = CdmBase.deproxy(singleMediaRepresentationPart, ImageFile.class);
+                image.setHeight(imageInfo.getHeight());
+                image.setWidth(imageInfo.getWidth());
             }
             singleMediaRepresentationPart.getMediaRepresentation().setMimeType(imageInfo.getMimeType());
             singleMediaRepresentationPart.getMediaRepresentation().setSuffix(imageInfo.getSuffix());
index 4fddde22da88c21a98112a83aab390da7950dfdc..eb521594d88b9254061657436cc3510b22cc0ce7 100644 (file)
@@ -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: 4.9.2
+Bundle-Version: 4.10.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: EDIT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
index fcc5488a8b117b54efeebec97916bee997c3df60..5432d8640e07ad204e8e7cd3342cfeea715bedcf 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.9.2</version>
+    <version>4.10.0-SNAPSHOT</version>
   </parent>
   <artifactId>eu.etaxonomy.taxeditor.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
index f51107653b64e8c0aec5f0d04f30cdb7021fef01..006d0e762437ef8bde77cdedff1448df7bf2cabc 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Webapp
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.webapp;singleton:=true
-Bundle-Version: 4.9.2
+Bundle-Version: 4.10.0.qualifier
 Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
index fd42808459000e60b21d29822b963525b6d7b2f3..683382dd0c8a3a2d73352299e91a195d7fe39a82 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.9.2</version>
+    <version>4.10.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.webapp</artifactId>
index b245ce5382bd471fdf8b85713908645ee35ce84f..f27d3e9d49d3678f000ede7e474c37952c05c690 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Workbench Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.workbench;singleton:=true
-Bundle-Version: 4.9.2
+Bundle-Version: 4.10.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.workbench.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
index 06170e39304325350a5be61e23c82ec8dbd7bfd0..ff8a1ed2b23c477e265d8deca4fcfc06f1c7e4dd 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.9.2</version>
+    <version>4.10.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index f84ca78c1ec5b5f147eeb39c7c3ecc540dee078c..910ff29a0b67b3c90a5616715c4da1e16b800201 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="4.9.2">
+<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="4.10.0.qualifier">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>
index 5b7e248faf34bcf4b3d15740158cab07843a61c8..1e106e92868c8226dae8c891a6ac2bd2441f3a52 100644 (file)
@@ -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.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="4.9.2" useFeatures="true" includeLaunchers="true">
+<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="4.10.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
index ab374a5d6288f921240f14c9fa863a89a38c265c..f962953462712254de1bc6c0bf508ea18419029e 100644 (file)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.9.2</version>
+    <version>4.10.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 5056a1c8b2160ac4847b2accc9ecb832827f19ad..b1607e7853cf85edd687919d6ce9c5aaa207bfa8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>4.9.2</version>
+  <version>4.10.0-SNAPSHOT</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy
   <properties>
     <java.codelevel>1.8</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>4.9.0</cdmlib.version>
+    <cdmlib.version>4.10.0-SNAPSHOT</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <!-- Increasing tycho above 0.22.0 will fail for the macosx build because 
       for higher version numbers tycho needs to be build against Eclipse Mars or 
       higher -->
     <tycho.version>1.0.0</tycho.version>
-    <taxeditor.version>4.9.0</taxeditor.version>
+    <taxeditor.version>4.10.0-SNAPSHOT</taxeditor.version>
     <update.dir>snapshot</update.dir>
     <unitils.version>3.4.2</unitils.version>
     <log4j.version>1.2.17</log4j.version>