Bug 534073: [Tips] Create JSon based Tip Providers

Fixed NLS for jdt tips

Change-Id: I8de826766b53593d9e80ebea96007eac54215ca7
Signed-off-by: Wim Jongman <wim.jongman@remainsoftware.com>

3 files changed, 28 insertions, 6 deletions

diff --git a/bundles/org.eclipse.jdt.tips.user/src/org/eclipse/jdt/tips/user/internal/JDTTipProvider.java b/bundles/org.eclipse.jdt.tips.user/src/org/eclipse/jdt/tips/user/internal/JDTTipProvider.java
index cd91ea1e3..422a0660b 100644
--- a/bundles/org.eclipse.jdt.tips.user/src/org/eclipse/jdt/tips/user/internal/JDTTipProvider.java
+++ b/bundles/org.eclipse.jdt.tips.user/src/org/eclipse/jdt/tips/user/internal/JDTTipProvider.java
@@ -24,7 +24,7 @@ import org.eclipse.tips.json.JsonTipProvider;
 
 public class JDTTipProvider extends JsonTipProvider {
 
-	private static final String EMPTY = "";
+	private static final String EMPTY = ""; //$NON-NLS-1$
 	private static final String FILENAME = "jdttips.json"; //$NON-NLS-1$
 	private String fUrl;
 	private File fStateLocation;
@@ -44,22 +44,22 @@ public class JDTTipProvider extends JsonTipProvider {
 		try {
 
 			SubMonitor monitor = SubMonitor.convert(pMonitor, 1);
-			monitor.setTaskName("Fetching content..");
+			monitor.setTaskName(Messages.JDTTipProvider_1);
 			File localFile = fetchContent();
 			try {
 				setJsonUrl(localFile.toURI().toURL().toString());
 			} catch (MalformedURLException e) {
-				getManager().log(getStatus("Could not get local URL", e));
+				getManager().log(getStatus(Messages.JDTTipProvider_2, e));
 			}
 			monitor.worked(1);
 			return super.loadNewTips(pMonitor);
 		} catch (Exception e) {
-			return getStatus("Could not load new Tips", e);
+			return getStatus(Messages.JDTTipProvider_3, e);
 		}
 	}
 
 	private IStatus getStatus(String message, Exception pException) {
-		return new Status(IStatus.ERROR, "org.eclipse.jdt.tips.user", message, pException);
+		return new Status(IStatus.ERROR, "org.eclipse.jdt.tips.user", message, pException); //$NON-NLS-1$
 	}
 
 	private File fetchContent() throws IOException {
@@ -133,7 +133,7 @@ public class JDTTipProvider extends JsonTipProvider {
 
 		if (!fStateLocation.canRead() || !fStateLocation.canWrite()) {
 			throw new IOException(
-					MessageFormat.format("Statelocation {0} not accessible.", fStateLocation.getAbsolutePath()));
+					MessageFormat.format(Messages.JDTTipProvider_5, fStateLocation.getAbsolutePath()));
 		}
 		return fStateLocation;
 	}
diff --git a/bundles/org.eclipse.jdt.tips.user/src/org/eclipse/jdt/tips/user/internal/Messages.java b/bundles/org.eclipse.jdt.tips.user/src/org/eclipse/jdt/tips/user/internal/Messages.java
new file mode 100644
index 000000000..bfb46e91c
--- /dev/null
+++ b/bundles/org.eclipse.jdt.tips.user/src/org/eclipse/jdt/tips/user/internal/Messages.java
@@ -0,0 +1,18 @@
+package org.eclipse.jdt.tips.user.internal;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.jdt.tips.user.internal.messages"; //$NON-NLS-1$
+	public static String JDTTipProvider_1;
+	public static String JDTTipProvider_2;
+	public static String JDTTipProvider_3;
+	public static String JDTTipProvider_5;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/bundles/org.eclipse.jdt.tips.user/src/org/eclipse/jdt/tips/user/internal/messages.properties b/bundles/org.eclipse.jdt.tips.user/src/org/eclipse/jdt/tips/user/internal/messages.properties
new file mode 100644
index 000000000..c0944e82e
--- /dev/null
+++ b/bundles/org.eclipse.jdt.tips.user/src/org/eclipse/jdt/tips/user/internal/messages.properties
@@ -0,0 +1,4 @@
+JDTTipProvider_1=Fetching content..
+JDTTipProvider_2=Could not get local URL
+JDTTipProvider_3=Could not load new Tips
+JDTTipProvider_5=Statelocation {0} not accessible.