Merge branch 'hotfix/4.9.2'

diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
index f02f7ee007618801dc92f8514b80f72b4a3867fd..0dd36b015453a21e9322bb11dcd62d667570b055 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: 4.9.1
+Bundle-Version: 4.9.2
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/plugin

diff --git a/eu.etaxonomy.taxeditor.application/pom.xml b/eu.etaxonomy.taxeditor.application/pom.xml
index 42be5b0202e0641666d0313dc0dc86a990bc5e06..1d0eebe08108bdca801863ab6fdc8aa25f9bfd2e 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/pom.xml
+++ b/eu.etaxonomy.taxeditor.application/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.9.1</version>
+    <version>4.9.2</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 2f672b21dc3898e38aad985e1841a117f96d68a3..8b981500023aa75d12793300cd422529e9f0e169 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: 4.9.1
+Bundle-Version: 4.9.2
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/build.properties b/eu.etaxonomy.taxeditor.bulkeditor/build.properties
index 15f137137a80719d05b1b1c5e2aa081e78160dda..a3e492fdde49a47da163d91a9b452ab6b4db7c0d 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/build.properties
+++ b/eu.etaxonomy.taxeditor.bulkeditor/build.properties
@@ -7,7 +7,6 @@ bin.includes = META-INF/,\
                p2.inf,\\r
                OSGI-INF/l10n/bundle.properties,\\r
                OSGI-INF/l10n/bundle_de.properties,\\r
-               src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties,\\r
-               src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties,\\r
-               fragment.e4xmi\r
+               fragment.e4xmi,\\r
+               src/main/java/eu/etaxonomy/taxeditor/l10n/\r
                
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
index 48dbcde4769f43f7d7b60778befe0ea4791d6ab6..09b59f9cc4682b62e23a2a2280187436e762cac8 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.9.1</version>
+               <version>4.9.2</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ConvertPerson2TeamRemotingHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ConvertPerson2TeamRemotingHandler.java
index fa4081c3a19061e2c4917e23f1e98072d9dc2845..2b145131e04deaf4357c54eed2d73df8f51e9814 100755 (executable)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ConvertPerson2TeamRemotingHandler.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ConvertPerson2TeamRemotingHandler.java
@@ -26,8 +26,8 @@ import org.eclipse.ui.handlers.HandlerUtil;
 
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.agent.Person;
-import eu.etaxonomy.taxeditor.bulkeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.bulkeditor.operation.ConvertPerson2TeamOperation;
+import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.operation.RemotingCdmHandler;
 
 /**

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
index 38c1e0382825171576c7fe1f88a48fb0223de835..4abfd83f1ddcd9127cceee28866e305ce7768211 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
@@ -52,7 +52,7 @@ import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotation;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotationModel;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
 import eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin;
-import eu.etaxonomy.taxeditor.bulkeditor.l10n.Messages;
+import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.DeleteResultMessagingUtils;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -68,7 +68,7 @@ public class DeleteHandler extends AbstractHandler {
 
 
 
-    private static final String COULD_NOT_BE_DELETED = Messages.DeleteHandler_COULD_NOT_BE_DELETED;
+    private static final String COULD_NOT_BE_DELETED = eu.etaxonomy.taxeditor.l10n.Messages.DeleteHandler_COULD_NOT_BE_DELETED;
     private static final String AN_EXCEPTION_OCCURED = Messages.DeleteHandler_EXCEPTION;
     private static final String DELETE_NOT_POSSIBLE = Messages.DeleteHandler_DELETE_NOT_POSSIBLE;
     private static final String DO_YOU_REALLY_WANT_TO_DELETE_THE_S = Messages.DeleteHandler_REALLY_DELETE;
@@ -83,7 +83,7 @@ public class DeleteHandler extends AbstractHandler {
     private static final String SPECIMEN_OR_OBSERVATION = Messages.DeleteHandler_SPECIMEN;
     private static final String OBJECT = Messages.DeleteHandler_OBJECT;
     private static final String SKIP = Messages.DeleteHandler_SKIP;
-    private static final String DELETE = Messages.DeleteHandler_DELETE;
+    private static final String DELETE = eu.etaxonomy.taxeditor.l10n.Messages.DeleteHandler_DELETE;
     private static final String CONFIRM_DELETION = Messages.DeleteHandler_CONFIRM;
 
     @Override
@@ -258,7 +258,7 @@ public class DeleteHandler extends AbstractHandler {
                             }
                             //convert first letter to upper case
                             errorMessage = errorMessage.substring(0, 1).toUpperCase()+errorMessage.substring(1);
-                            errorMessage += Messages.DeleteHandler_CAN_BE_DELETED;
+                            errorMessage += eu.etaxonomy.taxeditor.l10n.Messages.DeleteHandler_CAN_BE_DELETED;
                             //MessagingUtils.errorDialog("test", getClass(), "message", TaxeditorBulkeditorPlugin.PLUGIN_ID, result.getExceptions().iterator().next(),true);
                             DeleteResultMessagingUtils.messageDialogWithDetails(result, errorMessage, TaxeditorBulkeditorPlugin.PLUGIN_ID);
                         }

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/l10n/Messages.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/l10n/Messages.java
deleted file mode 100755 (executable)
index 7235312..0000000
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/l10n/Messages.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
-* Copyright (C) 2017 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.taxeditor.bulkeditor.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author k.luther
- * @date 10.03.2017
- *
- */
-public class Messages extends NLS {
-    private static final String BUNDLE_NAME = "src/main/java/eu.etaxonomy.taxeditor.bulkeditor.l10n.messages"; //$NON-NLS-1$
-    public static String ReferencingObjectsLabelProvider_No_description_available;
-    public static String ConvertPerson2TeamHandler_warning;
-    public static String ConvertPerson2TeamHandler_lable;
-    public static String DeleteHandler_CAN_BE_DELETED;
-    public static String DeleteHandler_CONFIRM;
-    public static String DeleteHandler_COULD_NOT_BE_DELETED;
-    public static String DeleteHandler_DELETE;
-    public static String DeleteHandler_DELETE_NOT_POSSIBLE;
-    public static String DeleteHandler_EXCEPTION;
-    public static String DeleteHandler_GROUP;
-    public static String DeleteHandler_IRREVERSIBLE;
-    public static String DeleteHandler_MEDIA;
-    public static String DeleteHandler_NAME;
-    public static String DeleteHandler_OBJECT;
-    public static String DeleteHandler_REALLY_DELETE;
-    public static String DeleteHandler_REFERENCE;
-    public static String DeleteHandler_SKIP;
-    public static String DeleteHandler_SPECIMEN;
-    public static String DeleteHandler_SYNONYM;
-    public static String DeleteHandler_TAXON;
-    public static String DeleteHandler_TAXON_CAN_NOT_BE_DELETED;
-    public static String DeleteHandler_TEAM_OR_PERSON;
-    public static String DeleteHandler_USER;
-    static {
-        // initialize resource bundle
-        NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-    }
-
-    private Messages() {
-    }
-}

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/l10n/messages.properties b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/l10n/messages.properties
deleted file mode 100755 (executable)
index 6cab4cb..0000000
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/l10n/messages.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-ReferencingObjectsLabelProvider_No_description_available=No description available
-ConvertPerson2TeamHandler_warning=While reloading the data an exception occured
-ConvertPerson2TeamHandler_lable=Convert Person to Team
-DeleteHandler_CAN_BE_DELETED=can be deleted but related object(s) could not be deleted. 
-DeleteHandler_CONFIRM=Confirm Deletion
-DeleteHandler_COULD_NOT_BE_DELETED=could not be deleted.
-DeleteHandler_DELETE=Delete
-DeleteHandler_DELETE_NOT_POSSIBLE=Delete not possible
-DeleteHandler_EXCEPTION=An exception occured.
-DeleteHandler_GROUP=group
-DeleteHandler_IRREVERSIBLE=\nThis operation is irreversible!
-DeleteHandler_MEDIA=media
-DeleteHandler_NAME=name
-DeleteHandler_OBJECT=object
-DeleteHandler_REALLY_DELETE=Do you really want to delete the %s?
-DeleteHandler_REFERENCE=reference
-DeleteHandler_SKIP=Skip
-DeleteHandler_SPECIMEN=specimen or observation
-DeleteHandler_SYNONYM=synonym
-DeleteHandler_TAXON=taxon
-DeleteHandler_TAXON_CAN_NOT_BE_DELETED=The taxon can not be deleted in bulk editor. It is used in a classification.
-DeleteHandler_TEAM_OR_PERSON=team or person
-DeleteHandler_USER=user

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/l10n/messages_de.properties
deleted file mode 100755 (executable)
index 1b8dc70..0000000
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/l10n/messages_de.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-ReferencingObjectsLabelProvider_No_description_available=Keine Beschreibung verfügbar
-ConvertPerson2TeamHandler_warning=Beim Neuladen der Daten ist ein Fehler aufgetreten
-ConvertPerson2TeamHandler_lable=Wandle Person in Team um
-DeleteHandler_CAN_BE_DELETED=kann gelöscht werden, aber verknüpfte Objekte können nicht gelöscht werden. 
-DeleteHandler_CONFIRM=Löschen bestätigen
-DeleteHandler_COULD_NOT_BE_DELETED=konnte nicht gelöscht werden.
-DeleteHandler_DELETE=Löschen
-DeleteHandler_DELETE_NOT_POSSIBLE=Löschen nicht möglich
-DeleteHandler_EXCEPTION=Ein Fehler ist aufgetreten.
-DeleteHandler_GROUP=Gruppe
-DeleteHandler_IRREVERSIBLE=Dieser Vorgang kann nicht rückgängig gemacht werden!
-DeleteHandler_MEDIA=Medienobjekt
-DeleteHandler_NAME=Name
-DeleteHandler_OBJECT=Objekt
-DeleteHandler_REALLY_DELETE=%s wirklich löschen?
-DeleteHandler_REFERENCE=Referenz
-DeleteHandler_SKIP=Überspringen
-DeleteHandler_SPECIMEN=Beleg oder Beobachtung
-DeleteHandler_SYNONYM=Synonym
-DeleteHandler_TAXON=Taxon
-DeleteHandler_TAXON_CAN_NOT_BE_DELETED=Das Taxon kann im Bulk-Editor nicht gelöscht werden. Es wird in einer Klassifikation verwendet.
-DeleteHandler_TEAM_OR_PERSON=Team oder Person
-DeleteHandler_USER=User

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsLabelProvider.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsLabelProvider.java
index 84322e296d9dd5cfe0aadd63b1449cf5b5f77373..f071aba14017657af479547fc00f389b2638a70e 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsLabelProvider.java
@@ -17,7 +17,7 @@ import org.eclipse.swt.graphics.Image;
 
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.taxeditor.bulkeditor.l10n.Messages;
+import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.DescriptionHelper;
 
 /**

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
index 66eb00b60d027257a77d0299af364a8d0217b80b..efc35c5dc507fd6b69f354e92e77330ec806067c 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
@@ -15,6 +15,29 @@ public class Messages extends NLS {
        public static String BulkEditorInputType_6;
        public static String BulkEditorInputType_7;
        public static String BulkEditorInputType_8;
+       public static String ReferencingObjectsLabelProvider_No_description_available;
+    public static String ConvertPerson2TeamHandler_warning;
+    public static String ConvertPerson2TeamHandler_lable;
+    public static String DeleteHandler_CAN_BE_DELETED;
+    public static String DeleteHandler_CONFIRM;
+    public static String DeleteHandler_COULD_NOT_BE_DELETED;
+    public static String DeleteHandler_DELETE;
+    public static String DeleteHandler_DELETE_NOT_POSSIBLE;
+    public static String DeleteHandler_EXCEPTION;
+    public static String DeleteHandler_GROUP;
+    public static String DeleteHandler_IRREVERSIBLE;
+    public static String DeleteHandler_MEDIA;
+    public static String DeleteHandler_NAME;
+    public static String DeleteHandler_OBJECT;
+    public static String DeleteHandler_REALLY_DELETE;
+    public static String DeleteHandler_REFERENCE;
+    public static String DeleteHandler_SKIP;
+    public static String DeleteHandler_SPECIMEN;
+    public static String DeleteHandler_SYNONYM;
+    public static String DeleteHandler_TAXON;
+    public static String DeleteHandler_TAXON_CAN_NOT_BE_DELETED;
+    public static String DeleteHandler_TEAM_OR_PERSON;
+    public static String DeleteHandler_USER;
        static {
                // initialize resource bundle
                NLS.initializeMessages(BUNDLE_NAME, Messages.class);

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
index ec3eba487a8ede1eb82653fb8827a72b04a2d138..1972e26f9edc58eca31776429d6ab52cb2345fec 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
@@ -9,4 +9,27 @@ BulkEditorInputType_7=Taxa
 BulkEditorInputType_8=Media
 
 USER_CREATOR_user_exists_title=The user already exists
-USER_CREATOR_user_exists=The user already exists in database
\ No newline at end of file
+USER_CREATOR_user_exists=The user already exists in database
+ReferencingObjectsLabelProvider_No_description_available=No description available
+ConvertPerson2TeamHandler_warning=While reloading the data an exception occured
+ConvertPerson2TeamHandler_lable=Convert Person to Team
+DeleteHandler_CAN_BE_DELETED=can be deleted but related object(s) could not be deleted. 
+DeleteHandler_CONFIRM=Confirm Deletion
+DeleteHandler_COULD_NOT_BE_DELETED=could not be deleted.
+DeleteHandler_DELETE=Delete
+DeleteHandler_DELETE_NOT_POSSIBLE=Delete not possible
+DeleteHandler_EXCEPTION=An exception occured.
+DeleteHandler_GROUP=group
+DeleteHandler_IRREVERSIBLE=\nThis operation is irreversible!
+DeleteHandler_MEDIA=media
+DeleteHandler_NAME=name
+DeleteHandler_OBJECT=object
+DeleteHandler_REALLY_DELETE=Do you really want to delete the %s?
+DeleteHandler_REFERENCE=reference
+DeleteHandler_SKIP=Skip
+DeleteHandler_SPECIMEN=specimen or observation
+DeleteHandler_SYNONYM=synonym
+DeleteHandler_TAXON=taxon
+DeleteHandler_TAXON_CAN_NOT_BE_DELETED=The taxon can not be deleted in bulk editor. It is used in a classification.
+DeleteHandler_TEAM_OR_PERSON=team or person
+DeleteHandler_USER=user
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
index 83a53ae51609d2c28491a93db66259828fb0e0da..289fc5eb7904fec6f2c6c2f4719b5cfed3c4af4b 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
@@ -10,3 +10,26 @@ BulkEditorInputType_8=Medien
 
 USER_CREATOR_user_exists_title=Der Benutzer existiert bereits
 USER_CREATOR_user_exists=Der Benutzer existiert bereits in der Datenbank.
+ReferencingObjectsLabelProvider_No_description_available=Keine Beschreibung verfügbar
+ConvertPerson2TeamHandler_warning=Beim Neuladen der Daten ist ein Fehler aufgetreten
+ConvertPerson2TeamHandler_lable=Wandle Person in Team um
+DeleteHandler_CAN_BE_DELETED=kann gelöscht werden, aber verknüpfte Objekte können nicht gelöscht werden. 
+DeleteHandler_CONFIRM=Löschen bestätigen
+DeleteHandler_COULD_NOT_BE_DELETED=konnte nicht gelöscht werden.
+DeleteHandler_DELETE=Löschen
+DeleteHandler_DELETE_NOT_POSSIBLE=Löschen nicht möglich
+DeleteHandler_EXCEPTION=Ein Fehler ist aufgetreten.
+DeleteHandler_GROUP=Gruppe
+DeleteHandler_IRREVERSIBLE=Dieser Vorgang kann nicht rückgängig gemacht werden!
+DeleteHandler_MEDIA=Medienobjekt
+DeleteHandler_NAME=Name
+DeleteHandler_OBJECT=Objekt
+DeleteHandler_REALLY_DELETE=%s wirklich löschen?
+DeleteHandler_REFERENCE=Referenz
+DeleteHandler_SKIP=Überspringen
+DeleteHandler_SPECIMEN=Beleg oder Beobachtung
+DeleteHandler_SYNONYM=Synonym
+DeleteHandler_TAXON=Taxon
+DeleteHandler_TAXON_CAN_NOT_BE_DELETED=Das Taxon kann im Bulk-Editor nicht gelöscht werden. Es wird in einer Klassifikation verwendet.
+DeleteHandler_TEAM_OR_PERSON=Team oder Person
+DeleteHandler_USER=User

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 3ce7b394f82e8675b42610d0195240f23dd425c3..41e3fe4821551a2c4ee65b0d8a7f1a3c16589bc5 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: 4.9.1
+Bundle-Version: 4.9.2
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index ae0689949c3e8647b80db37e034789d203e09eca..86214a2a417bf3f6887ee6e6151c1bbde7cbca87 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>4.9.1</version>\r
+    <version>4.9.2</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 ab9793aa8163282c362ed32bbf0ae84d711c108a..b8ee8b0bf19f2ce6cea286c0cf449dcfaad46f96 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: 4.9.1
+Bundle-Version: 4.9.2
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: OSGI-INF/l10n/plugin

diff --git a/eu.etaxonomy.taxeditor.editor/build.properties b/eu.etaxonomy.taxeditor.editor/build.properties
index 7490fd9df63073de602f09537582029988a2b80f..700aa7fc8f0e0b4839830a902e3b1c25df9d6a4e 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/build.properties
+++ b/eu.etaxonomy.taxeditor.editor/build.properties
@@ -6,6 +6,5 @@ bin.includes = META-INF/,\
                icons/,\
                p2.inf,\
                OSGI-INF/,\
-               src/main/java/eu/etaxonomy/taxeditor/editor/l10n/,\
-               fragment.e4xmi
-bin.excludes = src/main/java/eu/etaxonomy/taxeditor/editor/l10n/Messages.java
+               fragment.e4xmi,\
+               src/main/java/eu/etaxonomy/taxeditor/editor/l10n/

diff --git a/eu.etaxonomy.taxeditor.editor/pom.xml b/eu.etaxonomy.taxeditor.editor/pom.xml
index 2199c5a3088e0c11a639a62971e4f650776c5a4e..29ac5d4f20596a4ed49120c568850e0bc924e89e 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>4.9.1</version>
+    <version>4.9.2</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
index 486291e69e94b3657f3ef75fcd06efe3ea87b4b1..4ecf6b91942be3ea72e1b6fed6ec62a6ea597d6a 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="4.9.1"
+      version="4.9.2"
       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 c8ac243b2bb37f7f1b47bb7494e8b44d1d3944b9..a65fcb6028bfbdf3f4847e5615f916df319ac332 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>4.9.1</version>
+               <version>4.9.2</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 48cbf71d9ae4f406839835303df63d90b3614fe7..2fbce1b99da9f22f0cb7f46ddc995277a0c8ffc2 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="4.9.1"
+      version="4.9.2"
       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 8bcdf46ac8e5b70eed4881680e9cd9114c4e24a9..4b4ac0b141ffe60211e3fe3e590234c61efe8f4c 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>4.9.1</version>
+    <version>4.9.2</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 bd75a7a62ed87fec2a5b16dff85bceac02a8fb41..bc90fa7d7c24e3c898b7ac4627c58cdafb6f75f9 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: 4.9.1
+Bundle-Version: 4.9.2
 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 f667e1f490506f7ab2ff6e73a240e65d4ab6a437..07570b71ea82b268ceb9c149cd62d20e5fc1c039 100644 (file)
--- a/eu.etaxonomy.taxeditor.help/pom.xml
+++ b/eu.etaxonomy.taxeditor.help/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.9.1</version>
+               <version>4.9.2</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
index bd7f48d7a22f524e087af3b10358a1758bb7d587..bec3430eaead11d3dec515aab76b7723fb7b0962 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
@@ -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.1
+Bundle-Version: 4.9.2
 Bundle-ClassPath: .,
  lib/owlapi-xmlutils-4.1.4.jar,
  lib/commons-collections4-4.1.jar,

diff --git a/eu.etaxonomy.taxeditor.molecular.lib/pom.xml b/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
index 1958c1bae30b8d0d9ab848c390e816d4ff75494f..db01a2691cc69627f95f82a50224126679794f5e 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
+++ b/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.9.1</version>
+    <version>4.9.2</version>
   </parent>
   
   <name>Molecular Library Dependencies Bundle</name>

diff --git a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
index 44a44e330b3faec87f64484bf0249bdd30d2e36e..8c2c12a5e3c6167e0b3bf0f9a4eba59dafddd6f8 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
@@ -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.1
+Bundle-Version: 4.9.2
 Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

diff --git a/eu.etaxonomy.taxeditor.molecular/build.properties b/eu.etaxonomy.taxeditor.molecular/build.properties
index bdd1c23c42f573c05d209014e892ed57663fdf11..c4b90a5c9c42412c01f83ff37a7340ab3ebba982 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/build.properties
+++ b/eu.etaxonomy.taxeditor.molecular/build.properties
@@ -1,6 +1,7 @@
 bin.includes = .,\
-                          META-INF/,\
+               META-INF/,\
                plugin.xml,\
                icons/,\
-               OSGI-INF/
+               OSGI-INF/,\
+               src/main/java/eu/etaxonomy/taxeditor/molecular/l10n/
 source.. = src/main/java/

diff --git a/eu.etaxonomy.taxeditor.molecular/pom.xml b/eu.etaxonomy.taxeditor.molecular/pom.xml
index a7d947e2b2e03cd2e4b44527c0ca9d2c18807b1c..9f78a369da520011f40c5f8a822284ba76ba312e 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/pom.xml
+++ b/eu.etaxonomy.taxeditor.molecular/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.9.1</version>
+    <version>4.9.2</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 a1e7c62749ed5338287ff5d1be2e9d4e453b8e50..b0df060235751529582356f7e993fade871037e9 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: 4.9.1
+Bundle-Version: 4.9.2
 Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,

diff --git a/eu.etaxonomy.taxeditor.navigation/build.properties b/eu.etaxonomy.taxeditor.navigation/build.properties
index a91e33bdd84101031466963ea0cbe08056aea573..7dd6590fd84e11699a41670c81c2aeea1cf5872c 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/build.properties
+++ b/eu.etaxonomy.taxeditor.navigation/build.properties
@@ -6,9 +6,8 @@ bin.includes = META-INF/,\
                p2.inf,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/l10n/bundle_de.properties,\
-               src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties,\
-               src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties,\
-               fragment.e4xmi
+               fragment.e4xmi,\
+               src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/
 source.. = src/main/java/,\
            src/test/java/,\
            src/test/resources/

diff --git a/eu.etaxonomy.taxeditor.navigation/pom.xml b/eu.etaxonomy.taxeditor.navigation/pom.xml
index 41b7c025b9b001719fa5c5e59d7722214cb9f25a..ad585979d91292d21c7a442f567c489deefb46b0 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/pom.xml
+++ b/eu.etaxonomy.taxeditor.navigation/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.9.1</version>
+               <version>4.9.2</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 3fa1e9fe4be881034028e5843b24901738264b3a..fa7114784a12e05d916ef2bcd2afcf0aab10ddff 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: 4.9.1
+Bundle-Version: 4.9.2
 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 24d810a0b1ac861f350318c083b3f6a0fb94bfa2..c944d467c688be0cd310e1ada35fc121f11d7812 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/pom.xml
+++ b/eu.etaxonomy.taxeditor.printpublisher/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>4.9.1</version>
+               <version>4.9.2</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 882ffbda8593db8bca5f2f43e571e1392d562233..6007e5407064fb303bf4c64f977aebbcb8f2191f 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: 4.9.1
+Bundle-Version: 4.9.2
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/bundle

diff --git a/eu.etaxonomy.taxeditor.store/build.properties b/eu.etaxonomy.taxeditor.store/build.properties
index 65edf2e5e7b402e2cc281c79e3f5e004f861f1b9..30d726d7999f00fc80140b6975e87b6c6907a102 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/build.properties
+++ b/eu.etaxonomy.taxeditor.store/build.properties
@@ -10,7 +10,6 @@ bin.includes = META-INF/,\
                OSGI-INF/,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/l10n/bundle_de.properties,\
-               src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties,\
-               src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties,\
-               fragment.e4xmi
+               fragment.e4xmi,\
+               src/main/java/eu/etaxonomy/taxeditor/l10n/
 

diff --git a/eu.etaxonomy.taxeditor.store/pom.xml b/eu.etaxonomy.taxeditor.store/pom.xml
index 6193763a64e31916042b50f48d95881489a01c5f..4541b1f5fd90fef50d01a5bfd566a6ccb3e34e78 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/pom.xml
+++ b/eu.etaxonomy.taxeditor.store/pom.xml
@@ -3,7 +3,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>4.9.1</version>
+       <version>4.9.2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
index c457ea70ac5aa1b4f3c1c2e2fced9cf3fbad240b..4fddde22da88c21a98112a83aab390da7950dfdc 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: 4.9.1
+Bundle-Version: 4.9.2
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: EDIT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/eu.etaxonomy.taxeditor.test/pom.xml b/eu.etaxonomy.taxeditor.test/pom.xml
index 02fe75bb015e1b6b7db829082d27cfd9308185e1..fcc5488a8b117b54efeebec97916bee997c3df60 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/pom.xml
+++ b/eu.etaxonomy.taxeditor.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.9.1</version>
+    <version>4.9.2</version>
   </parent>
   <artifactId>eu.etaxonomy.taxeditor.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>

diff --git a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
index 5a00e56fdadda00ffea54e27e938a8d75ba57282..f51107653b64e8c0aec5f0d04f30cdb7021fef01 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
@@ -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.1
+Bundle-Version: 4.9.2
 Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy

diff --git a/eu.etaxonomy.taxeditor.webapp/pom.xml b/eu.etaxonomy.taxeditor.webapp/pom.xml
index 132880dc95fd1e0b35846d6b5ff45ef50a5ba7f6..fd42808459000e60b21d29822b963525b6d7b2f3 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/pom.xml
+++ b/eu.etaxonomy.taxeditor.webapp/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.9.1</version>
+    <version>4.9.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.webapp</artifactId>

diff --git a/eu.etaxonomy.taxeditor.workbench/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.workbench/META-INF/MANIFEST.MF
index 1f84059d17775571c0133b6897f5b22db7b6cf3d..b245ce5382bd471fdf8b85713908645ee35ce84f 100644 (file)
--- a/eu.etaxonomy.taxeditor.workbench/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.workbench/META-INF/MANIFEST.MF
@@ -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.1
+Bundle-Version: 4.9.2
 Bundle-Activator: eu.etaxonomy.taxeditor.workbench.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,

diff --git a/eu.etaxonomy.taxeditor.workbench/pom.xml b/eu.etaxonomy.taxeditor.workbench/pom.xml
index a97cb380afa9ca551df11b7792f33e7331d810f2..06170e39304325350a5be61e23c82ec8dbd7bfd0 100644 (file)
--- a/eu.etaxonomy.taxeditor.workbench/pom.xml
+++ b/eu.etaxonomy.taxeditor.workbench/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.9.1</version>
+    <version>4.9.2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
index 777bd7356ba72d9c6946472183b350f5c2f5d2f9..f84ca78c1ec5b5f147eeb39c7c3ecc540dee078c 100644 (file)
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
+++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
@@ -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.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.2">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>

diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
index d4f02c1479a6c9c487f1104974ce61196a99cb60..5b7e248faf34bcf4b3d15740158cab07843a61c8 100644 (file)
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
+++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
@@ -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.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.2" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>

diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
index 98e15af794b79b434bb04041892a2b11fb8384d7..ab374a5d6288f921240f14c9fa863a89a38c265c 100644 (file)
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.9.1</version>
+    <version>4.9.2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor/rcp.target b/eu.etaxonomy.taxeditor/rcp.target
index 281e4239a763688d4514552e0fa235b609b34bc9..51374cf4ab3b4fd8a1f2c00240646fa9a3c19cae 100644 (file)
--- a/eu.etaxonomy.taxeditor/rcp.target
+++ b/eu.etaxonomy.taxeditor/rcp.target
@@ -1,76 +1,76 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<?pde version="3.8"?><target includeMode="feature" name="Eclipse Neon Target" sequenceNumber="38">\r
-<locations>\r
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">\r
-<unit id="org.eclipse.nebula.widgets.compositetable.feature.feature.group" version="1.0.0.201703081533"/>\r
-<repository location="http://download.eclipse.org/nebula/releases/latest"/>\r
-</location>\r
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">\r
-<unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.5.100.v20170131-1452"/>\r
-<unit id="org.eclipse.equinox.p2.user.ui.source.feature.group" version="2.2.203.v20170131-1444"/>\r
-<unit id="org.eclipse.e4.rcp.feature.group" version="1.5.3.v20170228-0512"/>\r
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.300.v20161122-1740"/>\r
-<unit id="org.eclipse.swtbot.forms.feature.group" version="2.5.0.201609021837"/>\r
-<unit id="org.eclipse.help.feature.group" version="2.2.2.v20170301-0400"/>\r
-<unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.5.100.v20170131-1452"/>\r
-<unit id="org.eclipse.e4.rcp.source.feature.group" version="1.5.3.v20170228-0512"/>\r
-<unit id="org.eclipse.sdk.ide" version="4.6.3.M20170301-0400"/>\r
-<unit id="epp.package.modeling" version="4.6.3.20170314-1500"/>\r
-<unit id="org.eclipse.platform.sdk" version="4.6.3.M20170301-0400"/>\r
-<unit id="org.eclipse.jdt.feature.group" version="3.12.3.v20170301-0400"/>\r
-<unit id="org.eclipse.pde.source.feature.group" version="3.12.3.v20170301-0400"/>\r
-<unit id="org.eclipse.core.runtime.feature.feature.group" version="1.1.203.v20170209-1843"/>\r
-<unit id="org.eclipse.pde.feature.group" version="3.12.3.v20170301-0400"/>\r
-<unit id="org.eclipse.rcp.sdk.id" version="4.6.3.M20170301-0400"/>\r
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.5.0.201609021837"/>\r
-<unit id="org.eclipse.platform.feature.group" version="4.6.3.v20170301-0400"/>\r
-<repository location="http://download.eclipse.org/releases/neon"/>\r
-</location>\r
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">\r
-<unit id="org.eclipse.zest.sdk.feature.group" version="1.7.0.201606061308"/>\r
-<repository location="http://download.eclipse.org/releases/neon"/>\r
-</location>\r
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">\r
-<unit id="org.eclipse.oomph.setup.sdk.feature.group" version="1.7.0.v20170305-1123"/>\r
-<repository location="http://download.eclipse.org/releases/neon"/>\r
-</location>\r
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">\r
-<unit id="org.eclipse.equinox.sdk.feature.group" version="3.12.0.v20170209-1843"/>\r
-<unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.2.203.v20170131-1444"/>\r
-<unit id="org.eclipse.equinox.p2.extras.feature.feature.group" version="1.2.203.v20170131-1444"/>\r
-<unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.12.3.v20170209-1843"/>\r
-<unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.12.0.v20160815-1406"/>\r
-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.12.3.v20170209-1843"/>\r
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="1.3.3.v20170209-1843"/>\r
-<unit id="org.eclipse.equinox.p2.core.feature.feature.group" version="1.3.203.v20170131-1444"/>\r
-<unit id="org.eclipse.equinox.p2.rcp.feature.source.feature.group" version="1.2.203.v20170131-1444"/>\r
-<unit id="org.eclipse.equinox.p2.core.feature.source.feature.group" version="1.3.203.v20170131-1444"/>\r
-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.9.203.v20170131-1444"/>\r
-<unit id="org.eclipse.objectteams.otequinox.feature.group" version="2.5.2.201612071657"/>\r
-<unit id="org.eclipse.equinox.p2.extras.feature.source.feature.group" version="1.2.203.v20170131-1444"/>\r
-<repository location="http://download.eclipse.org/releases/neon"/>\r
-</location>\r
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">\r
-<unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="1.4.0.v20160526-0606"/>\r
-<unit id="org.eclipse.emf.ecore.feature.group" version="2.12.0.v20160420-0247"/>\r
-<unit id="org.eclipse.emf.ecore.xcore.lib.feature.group" version="1.2.100.v20160526-0606"/>\r
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160526-0356"/>\r
-<unit id="org.eclipse.emf.common.feature.group" version="2.12.0.v20160420-0247"/>\r
-<unit id="org.eclipse.emf.ecore.xcore.feature.group" version="1.4.0.v20160526-0606"/>\r
-<unit id="org.eclipse.emf.feature.group" version="2.12.0.v20160526-0356"/>\r
-<repository location="http://download.eclipse.org/releases/neon"/>\r
-</location>\r
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">\r
-<unit id="org.eclipse.e4.tools.context.spy.feature.feature.group" version="0.17.0.v20170601-1400"/>\r
-<unit id="org.eclipse.e4.tools.preference.spy.feature.feature.group" version="0.1.0.v20170601-0901"/>\r
-<unit id="org.eclipse.e4.tools.event.spy.feature.feature.group" version="0.15.0.v20170601-0901"/>\r
-<unit id="org.eclipse.e4.tools.spies.feature.feature.group" version="0.17.0.v20170601-1400"/>\r
-<unit id="org.eclipse.e4.tools.css.spy.feature.source.feature.group" version="0.14.0.v20170601-1400"/>\r
-<unit id="org.eclipse.e4.tools.bundle.spy.feature.feature.group" version="0.1.0.v20170601-1400"/>\r
-<unit id="org.eclipse.e4.tools.event.spy.feature.source.feature.group" version="0.15.0.v20170601-0901"/>\r
-<unit id="org.eclipse.e4.tools.css.spy.feature.feature.group" version="0.14.0.v20170601-1400"/>\r
-<unit id="org.eclipse.e4.tools.model.spy.feature.feature.group" version="0.1.0.v20170601-0901"/>\r
-<repository location="http://download.eclipse.org/e4/snapshots/org.eclipse.e4.tools/latest"/>\r
-</location>\r
-</locations>\r
-</target>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target includeMode="feature" name="Eclipse Neon Target" sequenceNumber="42">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.12.0.v20170209-1843"/>
+<unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.2.203.v20170131-1444"/>
+<unit id="org.eclipse.equinox.p2.extras.feature.feature.group" version="1.2.203.v20170131-1444"/>
+<unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.12.3.v20170209-1843"/>
+<unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.12.0.v20160815-1406"/>
+<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.12.3.v20170209-1843"/>
+<unit id="org.eclipse.equinox.core.feature.feature.group" version="1.3.3.v20170209-1843"/>
+<unit id="org.eclipse.equinox.p2.core.feature.feature.group" version="1.3.203.v20170131-1444"/>
+<unit id="org.eclipse.equinox.p2.rcp.feature.source.feature.group" version="1.2.203.v20170131-1444"/>
+<unit id="org.eclipse.equinox.p2.core.feature.source.feature.group" version="1.3.203.v20170131-1444"/>
+<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.9.203.v20170131-1444"/>
+<unit id="org.eclipse.objectteams.otequinox.feature.group" version="2.5.2.201612071657"/>
+<unit id="org.eclipse.equinox.p2.extras.feature.source.feature.group" version="1.2.203.v20170131-1444"/>
+<repository location="http://download.eclipse.org/releases/neon"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="1.4.0.v20160526-0606"/>
+<unit id="org.eclipse.emf.ecore.feature.group" version="2.12.0.v20160420-0247"/>
+<unit id="org.eclipse.emf.ecore.xcore.lib.feature.group" version="1.2.100.v20160526-0606"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160526-0356"/>
+<unit id="org.eclipse.emf.common.feature.group" version="2.12.0.v20160420-0247"/>
+<unit id="org.eclipse.emf.ecore.xcore.feature.group" version="1.4.0.v20160526-0606"/>
+<unit id="org.eclipse.emf.feature.group" version="2.12.0.v20160526-0356"/>
+<repository location="http://download.eclipse.org/releases/neon"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.zest.sdk.feature.group" version="1.7.0.201606061308"/>
+<repository location="http://download.eclipse.org/releases/neon"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.e4.tools.context.spy.feature.feature.group" version="0.17.0.v20170601-1400"/>
+<unit id="org.eclipse.e4.tools.preference.spy.feature.feature.group" version="0.1.0.v20170601-0901"/>
+<unit id="org.eclipse.e4.tools.event.spy.feature.feature.group" version="0.15.0.v20170601-0901"/>
+<unit id="org.eclipse.e4.tools.spies.feature.feature.group" version="0.17.0.v20170601-1400"/>
+<unit id="org.eclipse.e4.tools.css.spy.feature.source.feature.group" version="0.14.0.v20170601-1400"/>
+<unit id="org.eclipse.e4.tools.bundle.spy.feature.feature.group" version="0.1.0.v20170601-1400"/>
+<unit id="org.eclipse.e4.tools.event.spy.feature.source.feature.group" version="0.15.0.v20170601-0901"/>
+<unit id="org.eclipse.e4.tools.css.spy.feature.feature.group" version="0.14.0.v20170601-1400"/>
+<unit id="org.eclipse.e4.tools.model.spy.feature.feature.group" version="0.1.0.v20170601-0901"/>
+<repository location="http://download.eclipse.org/e4/snapshots/org.eclipse.e4.tools/latest"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.5.100.v20170131-1452"/>
+<unit id="org.eclipse.equinox.p2.user.ui.source.feature.group" version="2.2.203.v20170131-1444"/>
+<unit id="org.eclipse.e4.rcp.feature.group" version="1.5.3.v20170228-0512"/>
+<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.300.v20161122-1740"/>
+<unit id="org.eclipse.swtbot.forms.feature.group" version="2.5.0.201609021837"/>
+<unit id="org.eclipse.help.feature.group" version="2.2.2.v20170301-0400"/>
+<unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.5.100.v20170131-1452"/>
+<unit id="org.eclipse.e4.rcp.source.feature.group" version="1.5.3.v20170228-0512"/>
+<unit id="org.eclipse.sdk.ide" version="4.6.3.M20170301-0400"/>
+<unit id="epp.package.modeling" version="4.6.3.20170314-1500"/>
+<unit id="org.eclipse.platform.sdk" version="4.6.3.M20170301-0400"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.12.3.v20170301-0400"/>
+<unit id="org.eclipse.pde.source.feature.group" version="3.12.3.v20170301-0400"/>
+<unit id="org.eclipse.core.runtime.feature.feature.group" version="1.1.203.v20170209-1843"/>
+<unit id="org.eclipse.pde.feature.group" version="3.12.3.v20170301-0400"/>
+<unit id="org.eclipse.rcp.sdk.id" version="4.6.3.M20170301-0400"/>
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.5.0.201609021837"/>
+<unit id="org.eclipse.platform.feature.group" version="4.6.3.v20170301-0400"/>
+<repository location="http://download.eclipse.org/releases/neon"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.nebula.widgets.compositetable.feature.feature.group" version="1.0.0.201605182147"/>
+<repository location="http://archive.eclipse.org/nebula/Q22016/release/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.oomph.setup.sdk.feature.group" version="1.7.0.v20170305-1123"/>
+<repository location="http://download.eclipse.org/releases/neon"/>
+</location>
+</locations>
+</target>

diff --git a/pom.xml b/pom.xml
index fbd3d8a2225524e3dcbc80646540a6de3e3e6a79..5056a1c8b2160ac4847b2accc9ecb832827f19ad 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>4.9.1</version>
+  <version>4.9.2</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy