ref #4611 Restructure string externalization for taxeditor.bulkeditor

 - created l10n package and moved Messages.java and the
messages.properties files there

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

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/BulkEditorInputType.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/BulkEditorInputType.java
index ddbbbe9da10a7cabf962d7874bbf6e7c11d715a0..25b52c6666249006289c25582496ebbe07430635 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/BulkEditorInputType.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/BulkEditorInputType.java
@@ -29,6 +29,7 @@ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorConstants;
+import eu.etaxonomy.taxeditor.l10n.Messages;
 
 public enum BulkEditorInputType {
        AGENT(Messages.BulkEditorInputType_0, AgentEditorInput.ID),

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java
index c74147116c982db015f9ba692bb205cbe1aff891..85cc20373cb99d370c449e1c67f6d1bff3415095 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java
@@ -19,7 +19,7 @@ import eu.etaxonomy.cdm.api.service.IUserService;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
-import eu.etaxonomy.taxeditor.bulkeditor.input.Messages;
+import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/Messages.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
similarity index 83%
rename from eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/Messages.java
rename to eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
index adc1c6fa1baaf91ec02f498eadd24f2481890ae7..cfde0ad3f9ab8be445619143e860b831c31c08a0 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/Messages.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
@@ -1,9 +1,9 @@
-package eu.etaxonomy.taxeditor.bulkeditor.input;
+package eu.etaxonomy.taxeditor.l10n;
 
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-       private static final String BUNDLE_NAME = "OSGI-INF/l10n/messages"; //$NON-NLS-1$
+    private static final String BUNDLE_NAME = "eu.etaxonomy.taxeditor.l10n.messages"; //$NON-NLS-1$
     public static String USER_CREATOR_user_exists_title;
     public static String USER_CREATOR_user_exists;
        public static String BulkEditorInputType_0;

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/messages.properties b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
similarity index 100%
rename from eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/messages.properties
rename to eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
similarity index 100%
rename from eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/messages_de.properties
rename to eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties