tmf: Move the symbol provider messages to their own package

Message classes should be package-specific as much as possible.

Change-Id: I7eeae05c357799e4794af908fc53d376ab7cc28a
Signed-off-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Reviewed-on: https://git.eclipse.org/r/69559
Reviewed-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/Messages.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/Messages.java
index b40b3a812cf4a14863868f71006c0edf55d9d5a6..7442c377a1168cb76192b8300d0d6126be85f584 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/Messages.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/Messages.java
@@ -322,20 +322,6 @@ public class Messages extends NLS {
     public static String ExportToTextJob_Export_trace_to;
     public static String ExportToTextJob_Unable_to_export_trace;
 
-    public static String SymbolProviderConfigDialog_title;
-    public static String SymbolProviderConfigDialog_message;
-
-    public static String BasicSymbolProviderPrefPage_radioBinaryFile_text;
-    public static String BasicSymbolProviderPrefPage_radioBinaryFile_tooltip;
-    public static String BasicSymbolProviderPrefPage_radioMappingFile_text;
-    public static String BasicSymbolProviderPrefPage_radioMappingFile_tooltip;
-    public static String BasicSymbolProviderPrefPage_btnBrowse;
-    public static String BasicSymbolProviderPrefPage_description;
-    public static String BasicSymbolProviderPrefPage_ImportMappingDialogTitle;
-    public static String BasicSymbolProviderPrefPage_ImportBinaryFileDialogTitle;
-    public static String BasicSymbolProviderPrefPage_errorFileDoesNotExists;
-    public static String BasicSymbolProviderPrefPage_errorSpecifyFile;
-    public static String BasicSymbolProviderPrefPage_loadingConfigurations;
     static {
         // initialize resource bundle
         NLS.initializeMessages(BUNDLE_NAME, Messages.class);

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/messages.properties b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/messages.properties
index 862f4cc989a330a79a31979af7c71feacff70dd6..e37439dc231909dc0f75e83b4d394b29301d692a 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/messages.properties
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/messages.properties
@@ -321,22 +321,3 @@ CopyToClipboardOperation_OutOfMemoryErrorMessage=The full selection cannot be co
 ExportToTextJob_Export_to=Export to {0}...
 ExportToTextJob_Export_trace_to=Export trace to {0}
 ExportToTextJob_Unable_to_export_trace=Unable to export trace to {0}
-
-#Symbol providers
-SymbolProviderConfigDialog_title = Symbol mapping
-SymbolProviderConfigDialog_message = Configure how symbols are resolved
-
-BasicSymbolProviderPrefPage_radioBinaryFile_text=Select a binary file
-BasicSymbolProviderPrefPage_radioBinaryFile_tooltip=Select a binary file, executable or library,\nthat was used to produce the selected trace
-BasicSymbolProviderPrefPage_radioMappingFile_text=Select a mapping file
-BasicSymbolProviderPrefPage_radioMappingFile_tooltip=Select a symbol to address mapping file of the binary used\n\
-to produce the selected trace.\n\
-Such a file can be generated using the 'nm' tool.
-BasicSymbolProviderPrefPage_btnBrowse=Browse...
-BasicSymbolProviderPrefPage_description=Symbol provider configuration for trace "{0}"
-BasicSymbolProviderPrefPage_ImportMappingDialogTitle=Select Mapping File
-BasicSymbolProviderPrefPage_ImportBinaryFileDialogTitle=Select Binary File
-BasicSymbolProviderPrefPage_errorFileDoesNotExists=The current path is not a file or it does not exist
-BasicSymbolProviderPrefPage_errorSpecifyFile=Please specify a valid binary or mapping file
-BasicSymbolProviderPrefPage_loadingConfigurations=Loading configurations...
-

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/symbols/BasicSymbolProviderPreferencePage.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/symbols/BasicSymbolProviderPreferencePage.java
index 029c04b253d49830395458aaaf8c3a01765ca0df..1d577290c4e5ad44a473f152bc19cbdfa89a2e78 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/symbols/BasicSymbolProviderPreferencePage.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/symbols/BasicSymbolProviderPreferencePage.java
@@ -24,7 +24,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.tracecompass.internal.tmf.ui.Messages;
 import org.eclipse.tracecompass.internal.tmf.ui.symbols.BasicSymbolProvider.SourceKind;
 import org.eclipse.tracecompass.tmf.ui.symbols.AbstractSymbolProviderPreferencePage;
 

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/symbols/Messages.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/symbols/Messages.java
new file mode 100644 (file)
index 0000000..acd6b37
--- /dev/null
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/symbols/Messages.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Movidius Inc. and others
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+
+package org.eclipse.tracecompass.internal.tmf.ui.symbols;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Message bundle
+ */
+@SuppressWarnings("javadoc")
+public class Messages extends NLS {
+
+    private Messages() {
+    }
+
+    private static final String BUNDLE_NAME = "org.eclipse.tracecompass.internal.tmf.ui.symbols.messages"; //$NON-NLS-1$
+
+    static {
+        NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+    }
+
+    public static String BasicSymbolProviderPrefPage_radioBinaryFile_text;
+    public static String BasicSymbolProviderPrefPage_radioBinaryFile_tooltip;
+    public static String BasicSymbolProviderPrefPage_radioMappingFile_text;
+    public static String BasicSymbolProviderPrefPage_radioMappingFile_tooltip;
+    public static String BasicSymbolProviderPrefPage_btnBrowse;
+    public static String BasicSymbolProviderPrefPage_description;
+    public static String BasicSymbolProviderPrefPage_ImportMappingDialogTitle;
+    public static String BasicSymbolProviderPrefPage_ImportBinaryFileDialogTitle;
+    public static String BasicSymbolProviderPrefPage_errorFileDoesNotExists;
+    public static String BasicSymbolProviderPrefPage_errorSpecifyFile;
+
+}

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/symbols/messages.properties b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/symbols/messages.properties
new file mode 100644 (file)
index 0000000..b208152
--- /dev/null
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/symbols/messages.properties
@@ -0,0 +1,21 @@
+###############################################################################
+# Copyright (c) 2016 Movidius Inc. and others
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+
+BasicSymbolProviderPrefPage_radioBinaryFile_text=Select a binary file
+BasicSymbolProviderPrefPage_radioBinaryFile_tooltip=Select a binary file, executable or library,\nthat was used to produce the selected trace
+BasicSymbolProviderPrefPage_radioMappingFile_text=Select a mapping file
+BasicSymbolProviderPrefPage_radioMappingFile_tooltip=Select a symbol to address mapping file of the binary used\n\
+to produce the selected trace.\n\
+Such a file can be generated using the 'nm' tool.
+BasicSymbolProviderPrefPage_btnBrowse=Browse...
+BasicSymbolProviderPrefPage_description=Symbol provider configuration for trace "{0}"
+BasicSymbolProviderPrefPage_ImportMappingDialogTitle=Select Mapping File
+BasicSymbolProviderPrefPage_ImportBinaryFileDialogTitle=Select Binary File
+BasicSymbolProviderPrefPage_errorFileDoesNotExists=The current path is not a file or it does not exist
+BasicSymbolProviderPrefPage_errorSpecifyFile=Please specify a valid binary or mapping file

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/symbols/Messages.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/symbols/Messages.java
new file mode 100644 (file)
index 0000000..7dac927
--- /dev/null
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/symbols/Messages.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Movidius Inc. and others
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+
+package org.eclipse.tracecompass.tmf.ui.symbols;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Message bundle
+ *
+ * @noreference Messages class
+ */
+@SuppressWarnings("javadoc")
+public class Messages extends NLS {
+
+    private Messages() {
+    }
+
+    private static final String BUNDLE_NAME = "org.eclipse.tracecompass.tmf.ui.symbols.messages"; //$NON-NLS-1$
+
+    static {
+        NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+    }
+
+    public static String SymbolProviderConfigDialog_loadingConfigurations;
+    public static String SymbolProviderConfigDialog_title;
+    public static String SymbolProviderConfigDialog_message;
+
+}

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/symbols/SymbolProviderConfigDialog.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/symbols/SymbolProviderConfigDialog.java
index 1a6b4af7b0778abef6b4590cdaf40b146e3de1e5..f85f4ef5bcca33a025433337126923bfe2267551 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/symbols/SymbolProviderConfigDialog.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/symbols/SymbolProviderConfigDialog.java
@@ -29,7 +29,6 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.tracecompass.internal.tmf.ui.Messages;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
 
@@ -60,7 +59,7 @@ public class SymbolProviderConfigDialog extends TitleAreaDialog implements IPref
                 page.saveConfiguration();
             }
         });
-        monitor.beginTask(Messages.BasicSymbolProviderPrefPage_loadingConfigurations, fPreferencePages.length * 100);
+        monitor.beginTask(Messages.SymbolProviderConfigDialog_loadingConfigurations, fPreferencePages.length * 100);
         try {
             for (int i = 0; i < fPreferencePages.length; i++) {
                 ISymbolProviderPreferencePage page = fPreferencePages[i];

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/symbols/messages.properties b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/symbols/messages.properties
new file mode 100644 (file)
index 0000000..06394e0
--- /dev/null
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/symbols/messages.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2016 Movidius Inc. and others
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+
+SymbolProviderConfigDialog_loadingConfigurations=Loading configurations...
+SymbolProviderConfigDialog_title = Symbol mapping
+SymbolProviderConfigDialog_message = Configure how symbols are resolved