ref #4611 Restructure string externalization for taxeditor.navigation

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

diff --git a/eu.etaxonomy.taxeditor.navigation/build.properties b/eu.etaxonomy.taxeditor.navigation/build.properties
index 5a3a94bb31ea6e1ac134d59066789711c30fd861..69ef8f5075faababb7f90300b2b33522fc25fb88 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/build.properties
+++ b/eu.etaxonomy.taxeditor.navigation/build.properties
@@ -9,8 +9,8 @@ bin.includes = META-INF/,\
                p2.inf,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/l10n/bundle_de.properties,\
-               OSGI-INF/l10n/messages.properties,\
-               OSGI-INF/l10n/messages_de.properties
+               src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties,\
+               src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties
                
                
 

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/Messages.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/Messages.java
similarity index 83%
rename from eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/Messages.java
rename to eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/Messages.java
index 25ac9d4c87501821704f0e27597202ccce74b554..a21c6d4db58fe0df25504c51f1307b446bb11b8d 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/Messages.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/Messages.java
@@ -1,37 +1,37 @@
-/**\r
- * Copyright (C) 2014 EDIT\r
- * European Distributed Institute of Taxonomy\r
- * http://www.e-taxonomy.eu\r
- *\r
- * The contents of this file are subject to the Mozilla Public License Version 1.1\r
- * See LICENSE.TXT at the top of this package for the full license terms.\r
- */\r
-package eu.etaxonomy.taxeditor.navigation.search;\r
-\r
-import org.eclipse.osgi.util.NLS;\r
-\r
-/**\r
- * @author d.schild\r
- * @date 18.06.2014\r
- *\r
- */\r
-public class Messages extends NLS {\r
-    private static final String BUNDLE_NAME = "OSGI-INF/l10n/messages"; //$NON-NLS-1$\r
-    public static String SearchBar_0;\r
-    public static String SearchBar_1;\r
-    public static String SearchBar_2;\r
-    public static String SearchBar_3;\r
-    public static String SearchBar_4;\r
-    public static String SearchBar_6;\r
-    public static String SearchBar_7;\r
-    public static String SearchBar_8;\r
-    public static String SearchBar_9;\r
-\r
-    static {\r
-        // initialize resource bundle\r
-        NLS.initializeMessages(BUNDLE_NAME, Messages.class);\r
-    }\r
-\r
-    private Messages() {\r
-    }\r
-}\r
+/**
+ * Copyright (C) 2014 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.navigation.l10n;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author d.schild
+ * @date 18.06.2014
+ *
+ */
+public class Messages extends NLS {
+    private static final String BUNDLE_NAME = "eu.etaxonomy.taxeditor.navigation.l10n.messages"; //$NON-NLS-1$
+    public static String SearchBar_0;
+    public static String SearchBar_1;
+    public static String SearchBar_2;
+    public static String SearchBar_3;
+    public static String SearchBar_4;
+    public static String SearchBar_6;
+    public static String SearchBar_7;
+    public static String SearchBar_8;
+    public static String SearchBar_9;
+
+    static {
+        // initialize resource bundle
+        NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+    }
+
+    private Messages() {
+    }
+}

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

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

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
index 0b984e132fe8e16412025816d0aea8a7197edd4f..9d4c93f61939cd00424478085050685fd494c4de 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
@@ -40,6 +40,7 @@ import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.IContextListener;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin;
+import eu.etaxonomy.taxeditor.navigation.l10n.Messages;
 import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.preference.Resources;