Merge branch 'hotfix/4.8.1' into develop
authorjenkins <jenkins-int@bgbm.org>
Mon, 10 Jul 2017 11:57:33 +0000 (13:57 +0200)
committerjenkins <jenkins-int@bgbm.org>
Mon, 10 Jul 2017 11:57:33 +0000 (13:57 +0200)
42 files changed:
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.application/pom.xml
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.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmPersistentRemoteSource.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceBase.java
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/l10n/messages_de.properties
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.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.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/databaseAdmin/wizard/NameDetailsViewComposite.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/dnd/CdmAuthorityTableDropTargetListener.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 43f7b80..100ed9b 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.8.1
+Bundle-Version: 4.9.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/plugin
index 6b8e690..25537db 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.8.1</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index e871a5a..b0c3f49 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.8.1
+Bundle-Version: 4.9.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
index 03c5866..24923d5 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.8.1</version>
+               <version>4.9.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index ffaa86c..c5e1919 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.8.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.8.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.8.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.8.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.8.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.8.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.8.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.8.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.8.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.9.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.9.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.9.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.9.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.9.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.9.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.9.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.9.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.9.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 443c2a1..0aa133b 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.8.1
+Bundle-Version: 4.9.0.qualifier
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -645,15 +645,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.8.0.jar,
- lib/cdmlib-ext-4.8.0.jar,
- lib/cdmlib-io-4.8.0.jar,
- lib/cdmlib-model-4.8.0.jar,
- lib/cdmlib-persistence-4.8.0.jar,
- lib/cdmlib-print-4.8.0.jar,
- lib/cdmlib-remote-4.8.0.jar,
- lib/cdmlib-services-4.8.0.jar,
- lib/cdmlib-test-4.8.0.jar,
+ lib/cdmlib-commons-4.9.0-SNAPSHOT.jar,
+ lib/cdmlib-ext-4.9.0-SNAPSHOT.jar,
+ lib/cdmlib-io-4.9.0-SNAPSHOT.jar,
+ lib/cdmlib-model-4.9.0-SNAPSHOT.jar,
+ lib/cdmlib-persistence-4.9.0-SNAPSHOT.jar,
+ lib/cdmlib-print-4.9.0-SNAPSHOT.jar,
+ lib/cdmlib-remote-4.9.0-SNAPSHOT.jar,
+ lib/cdmlib-services-4.9.0-SNAPSHOT.jar,
+ lib/cdmlib-test-4.9.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 4c5c8ab..b786929 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.8.0.jar,\
-               lib/cdmlib-ext-4.8.0.jar,\
-               lib/cdmlib-io-4.8.0.jar,\
-               lib/cdmlib-model-4.8.0.jar,\
-               lib/cdmlib-persistence-4.8.0.jar,\
-               lib/cdmlib-print-4.8.0.jar,\
-               lib/cdmlib-remote-4.8.0.jar,\
-               lib/cdmlib-services-4.8.0.jar,\
-               lib/cdmlib-test-4.8.0.jar,\
+               lib/cdmlib-commons-4.9.0-SNAPSHOT.jar,\
+               lib/cdmlib-ext-4.9.0-SNAPSHOT.jar,\
+               lib/cdmlib-io-4.9.0-SNAPSHOT.jar,\
+               lib/cdmlib-model-4.9.0-SNAPSHOT.jar,\
+               lib/cdmlib-persistence-4.9.0-SNAPSHOT.jar,\
+               lib/cdmlib-print-4.9.0-SNAPSHOT.jar,\
+               lib/cdmlib-remote-4.9.0-SNAPSHOT.jar,\
+               lib/cdmlib-services-4.9.0-SNAPSHOT.jar,\
+               lib/cdmlib-test-4.9.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 c32deb9..fb586c8 100644 (file)
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>4.8.1</version>\r
+    <version>4.9.0-SNAPSHOT</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
index 3e7f334..db5b0fa 100644 (file)
@@ -221,7 +221,7 @@ public class CdmPersistentRemoteSource extends CdmRemoteSourceBase implements IC
                if (getName() != null){
                        return getName();
                }else{
-                       return null;
+                       return super.toString();
                }
        }
 
index 2dc891e..a96f254 100644 (file)
@@ -10,8 +10,11 @@ package eu.etaxonomy.taxeditor.remoting.source;
 
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
+
 import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteConfiguration;
 import eu.etaxonomy.cdm.api.service.IMetadataService;
+import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.config.CdmSource;
 import eu.etaxonomy.cdm.config.CdmSourceException;
 import eu.etaxonomy.cdm.model.metadata.CdmMetaDataPropertyName;
@@ -129,4 +132,13 @@ public class CdmRemoteSourceBase extends CdmSource implements ICdmRemoteSource {
                return metadataService.getCdmMetadataMap();
        }
 
+       @Override
+       public String toString() {
+               String result = CdmUtils.concat("/", baseUrl, contextPath);
+               if (StringUtils.isBlank(result)){
+                       return super.toString();
+               }else{
+                       return result;
+               }
+       }
 }
index 58a90c7..677c196 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.8.1
+Bundle-Version: 4.9.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: OSGI-INF/l10n/plugin
index 171cda4..83153e1 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>4.8.1</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
index d823f6f..a1a5776 100644 (file)
@@ -137,7 +137,7 @@ TaxonEditorInput_OPEN_MISSAPPLIED_NAME=
 TaxonEditorInput_TAXON_NOT_IN_CLASSIFICATION=Das akzeptierte Taxon ist in keiner Klassifikation vorhanden. Editieren mit dem Namens-Editor ist noch nicht implementier. Benutzen Sie den Bulk-Editor.
 TaxonEditorInputFactory_COULD_NOT_CREATE=Element konnte nicht erstellt werden
 TaxonEditorInputFactory_NOT_FOUND_TAXON=Konnte Taxonknoten nicht finden. UUID
-ToggleLinkWithTaxonSelectionHandler_LINK=Verknüpfen mit Taxonauswahl
+ToggleLinkWithTaxonSelectionHandler_LINK=Mit Taxonauswahl verknüpfen 
 ToggleLinkWithTaxonSelectionHandler_UNLINK=Verknüpfung mit Taxonauswahl aufheben 
 UseObjectManager_RESET_DATA=Wiederherstellen der Nutzugsdaten
 CdmAuthorityEditor_SAVING_AUTHORITY_EDITOR=Speichere CDM Authority Editor
index 8242ef9..a536b02 100644 (file)
@@ -164,8 +164,8 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
      * {@inheritDoc}
      */
     public void init(DerivateViewEditorInput editorInput){
-        this.derivateToRootEntityMap = new HashMap<SpecimenOrObservationBase<?>, SpecimenOrObservationBase<?>>();
-        this.rootElements = new HashSet<SpecimenOrObservationBase<?>>();
+        this.derivateToRootEntityMap = new HashMap<>();
+        this.rootElements = new HashSet<>();
 
         //init tree
         Collection<UUID> derivativeUuids = editorInput.getDerivativeUuids();
@@ -258,8 +258,8 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
 
             List<SpecimenOrObservationBase> derivates = null;
             if(derivativeUuids!=null){
-                this.derivateToRootEntityMap = new HashMap<SpecimenOrObservationBase<?>, SpecimenOrObservationBase<?>>();
-                this.rootElements = new HashSet<SpecimenOrObservationBase<?>>();
+                this.derivateToRootEntityMap = new HashMap<>();
+                this.rootElements = new HashSet<>();
                 derivates = CdmStore.getService(IOccurrenceService.class).load(new ArrayList(derivativeUuids), SPECIMEN_INIT_STRATEGY);
             }
             updateRootEntities(derivates);
@@ -270,8 +270,8 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
 
     public void updateRootEntities(List<SpecimenOrObservationBase> derivates) {
         if(derivates!=null){
-            this.derivateToRootEntityMap = new HashMap<SpecimenOrObservationBase<?>, SpecimenOrObservationBase<?>>();
-            this.rootElements = new HashSet<SpecimenOrObservationBase<?>>();
+            this.derivateToRootEntityMap = new HashMap<>();
+            this.rootElements = new HashSet<>();
             for (SpecimenOrObservationBase derivate : derivates) {
 
                 if(derivate instanceof FieldUnit){
@@ -300,7 +300,7 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
         //set selection to derivatives if the filter criteria
         //taxon assignment or derivative type are set
         if(derivates!=null && !derivateSearchCompositeController.isDefaultSearch()){
-            List<TreeNode> nodesToSelect = new ArrayList<TreeNode>();
+            List<TreeNode> nodesToSelect = new ArrayList<>();
             for (SpecimenOrObservationBase specimenOrObservationBase : derivates) {
                 nodesToSelect.add(new TreeNode(specimenOrObservationBase));
             }
@@ -334,7 +334,7 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
         // commit the conversation and start a new transaction immediately
         conversation.commit(true);
 
-        CdmStore.getService(IOccurrenceService.class).merge(new ArrayList<SpecimenOrObservationBase>(rootElements), true);
+        CdmStore.getService(IOccurrenceService.class).merge(new ArrayList<>(rootElements), true);
 
         monitor.worked(1);
 
@@ -400,7 +400,7 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
                 "sources" //$NON-NLS-1$
         });
         Map<Object, List<String>> specimenPropertyPathMap =
-                new HashMap<Object, List<String>>();
+                new HashMap<>();
         specimenPropertyPathMap.put(SpecimenOrObservationBase.class,specimenPropertyPaths);
         return specimenPropertyPathMap;
     }
@@ -523,7 +523,7 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
             }
             if(selectedTaxon!=null){
                 Collection<SpecimenOrObservationBase> fieldUnits = CdmStore.getService(IOccurrenceService.class).listFieldUnitsByAssociatedTaxon(selectedTaxon, null, null);
-                Collection<UUID> uuids = new HashSet<UUID>();
+                Collection<UUID> uuids = new HashSet<>();
                 for (SpecimenOrObservationBase specimenOrObservationBase : fieldUnits) {
                     uuids.add(specimenOrObservationBase.getUuid());
                 }
@@ -554,7 +554,7 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
      */
     @Override
     public List<SpecimenOrObservationBase<?>> getRootEntities() {
-        return new ArrayList<SpecimenOrObservationBase<?>>(rootElements);
+        return new ArrayList<>(rootElements);
     }
 
     public void toggleListenToSelectionChange(MPart part) {
index 6b75db2..f7b6ca0 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="4.8.1"
+      version="4.9.0.qualifier"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
index 46900cb..b8c5ea9 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.8.1</version>
+               <version>4.9.0-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
index cd7dbdd..cee276b 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="4.8.1"
+      version="4.9.0.qualifier"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
index a0a7181..ebe256e 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.8.1</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
index 7d14c71..34210b2 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.8.1
+Bundle-Version: 4.9.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
index 955204b..d81448d 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.8.1</version>
+               <version>4.9.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 456673c..3f942c0 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.8.1
+Bundle-Version: 4.9.0.qualifier
 Bundle-ClassPath: .,
  lib/owlapi-xmlutils-4.1.4.jar,
  lib/commons-collections4-4.1.jar,
index ad04ad7..5b965b7 100644 (file)
@@ -7,7 +7,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.8.1</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
   
   <name>Molecular Library Dependencies Bundle</name>
index c7dcd5b..935ed71 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.8.1
+Bundle-Version: 4.9.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
index 8dfb96b..7543bd6 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.8.1</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 5302609..ca3b929 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.8.1
+Bundle-Version: 4.9.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
index ca2b44c..8740bc6 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.8.1</version>
+               <version>4.9.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 9e282dc..9431174 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.8.1
+Bundle-Version: 4.9.0.qualifier
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,
index 787057b..efaa806 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>4.8.1</version>
+               <version>4.9.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index f1d6d67..8b406df 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.8.1
+Bundle-Version: 4.9.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/bundle
index e47ebf0..1e45ff9 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>4.8.1</version>
+       <version>4.9.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 1cd019c..b17b312 100755 (executable)
@@ -58,7 +58,7 @@ public class NameDetailsViewComposite extends Composite {
        this.config = config;
 
       // Composite composite = new Composite(parent, SWT.NULL);
-       
+
        this.setLayout(new GridLayout());
        isSimpleDetailsViewActivated= PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_SECTION);
        final Button activateCheckButton = new Button(this, SWT.CHECK);
@@ -81,7 +81,7 @@ public class NameDetailsViewComposite extends Composite {
         });
 
        child = new Composite(this, SWT.NULL);
-      
+
        child.setLayout(new GridLayout());
        child.setVisible(isSimpleDetailsViewActivated);
 
@@ -250,7 +250,7 @@ public class NameDetailsViewComposite extends Composite {
 
              }
         });
-       
+
        final Button showHybrid = new Button(child, SWT.CHECK);
        isShowHybrid = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_HYBRID);
        showHybrid.setText("Show hybrid section");
index bb58d88..fbb1862 100644 (file)
@@ -31,37 +31,23 @@ public class CdmAuthorityTableDropTargetListener implements DropTargetListener {
        public CdmAuthorityTableDropTargetListener(CdmAuthorityCompositeViewer viewer) {
                this.viewer = viewer;
        }
-       /* (non-Javadoc)
-        * @see org.eclipse.swt.dnd.DropTargetListener#dragEnter(org.eclipse.swt.dnd.DropTargetEvent)
-        */
+
        @Override
        public void dragEnter(DropTargetEvent event) {                          
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.swt.dnd.DropTargetListener#dragLeave(org.eclipse.swt.dnd.DropTargetEvent)
-        */
        @Override
        public void dragLeave(DropTargetEvent arg0) {
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.swt.dnd.DropTargetListener#dragOperationChanged(org.eclipse.swt.dnd.DropTargetEvent)
-        */
        @Override
        public void dragOperationChanged(DropTargetEvent arg0) {
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.swt.dnd.DropTargetListener#dragOver(org.eclipse.swt.dnd.DropTargetEvent)
-        */
        @Override
        public void dragOver(DropTargetEvent arg0) {
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.swt.dnd.DropTargetListener#drop(org.eclipse.swt.dnd.DropTargetEvent)
-        */
        @Override
        public void drop(DropTargetEvent dtevent) {
                if(TaxonNodeTransfer.getInstance().isSupportedType(dtevent.currentDataType)) {
@@ -75,9 +61,6 @@ public class CdmAuthorityTableDropTargetListener implements DropTargetListener {
                }               
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.swt.dnd.DropTargetListener#dropAccept(org.eclipse.swt.dnd.DropTargetEvent)
-        */
        @Override
        public void dropAccept(DropTargetEvent arg0) {
        }
index 489d29c..23d0569 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.8.1
+Bundle-Version: 4.9.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: EDIT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
index b9617ca..6c1ef92 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.8.1</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
   <artifactId>eu.etaxonomy.taxeditor.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
index 580dd64..2a0b739 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.8.1
+Bundle-Version: 4.9.0.qualifier
 Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
index 0af11a8..62f8603 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.8.1</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.webapp</artifactId>
index 11f41ed..d703701 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.8.1
+Bundle-Version: 4.9.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.workbench.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
index 8448651..0ecf4f9 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.8.1</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 427c1b8..a6eef04 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.8.1">
+<?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.0.qualifier">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>
index ed94cc8..a9a52a8 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.8.1" 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.9.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
index 03bb4e0..160835e 100644 (file)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.8.1</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index a967726..c26ccf8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>4.8.1</version>
+  <version>4.9.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.8.0</cdmlib.version>
+    <cdmlib.version>4.9.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.8.0</taxeditor.version>
+    <taxeditor.version>4.9.0-SNAPSHOT</taxeditor.version>
     <update.dir>snapshot</update.dir>
     <unitils.version>3.4.2</unitils.version>
     <log4j.version>1.2.17</log4j.version>