Externalize strings.
diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PBreakpointWorkbenchAdapterFactory.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PBreakpointWorkbenchAdapterFactory.java
index 31f9e66..329595b 100644
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PBreakpointWorkbenchAdapterFactory.java
+++ b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PBreakpointWorkbenchAdapterFactory.java
@@ -22,6 +22,7 @@
 import org.eclipse.ptp.debug.core.model.IPBreakpoint;
 import org.eclipse.ptp.debug.core.model.IPLineBreakpoint;
 import org.eclipse.ptp.debug.core.model.IPWatchpoint;
+import org.eclipse.ptp.debug.ui.messages.Messages;
 import org.eclipse.ui.model.IWorkbenchAdapter;
 import org.eclipse.ui.model.WorkbenchAdapter;
 
@@ -33,6 +34,7 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
 	 */
+	@SuppressWarnings("rawtypes")
 	public Object getAdapter(Object adaptableObject, Class adapterType) {
 		if (adapterType != IWorkbenchAdapter.class || !(adaptableObject instanceof IPBreakpoint)) {
 			return null;
@@ -41,10 +43,10 @@
 			public String getLabel(Object o) {
 				// for now
 				if (o instanceof IPLineBreakpoint) {
-					return PDebugUIMessages.getString("PBreakpointWorkbenchAdapterFactory.0");
+					return Messages.PBreakpointWorkbenchAdapterFactory_0;
 				}
 				if (o instanceof IPWatchpoint) {
-					return PDebugUIMessages.getString("PBreakpointWorkbenchAdapterFactory.1");
+					return Messages.PBreakpointWorkbenchAdapterFactory_1;
 				}
 				return super.getLabel(o); 
 			}
@@ -53,6 +55,7 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
 	 */
+	@SuppressWarnings("rawtypes")
 	public Class[] getAdapterList() {
 		return new Class[] { IWorkbenchAdapter.class };
 	}
diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugUIMessages.properties b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugUIMessages.properties
index 60ad73f..98f188f 100644
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugUIMessages.properties
+++ b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugUIMessages.properties
@@ -60,6 +60,3 @@
 PTPDebugModelPresentation.ignorecount1=[ignore count: {0}]
 
 PTPDebugModelPresentation.details1=<Job: {0} - Set: {1}>
-
-PBreakpointWorkbenchAdapterFactory.0=PTP breakpoint
-PBreakpointWorkbenchAdapterFactory.1=PTP watchpoint
diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/messages/Messages.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/messages/Messages.java
index d7c87ce..2d4a23e 100644
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/messages/Messages.java
+++ b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/messages/Messages.java
@@ -17,25 +17,22 @@
 	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.ui.messages.messages"; //$NON-NLS-1$
 	
 	public static String PVariableManager_0;
-
 	public static String PVariableManager_1;
-
 	public static String PVariableManager_2;
-
 	public static String PVariableManager_3;
-
 	public static String PVariableManager_4;
-
 	public static String PVariableManager_5;
 
 	public static String ResumeAction_0;
-
 	public static String StepIntoAction_0;
 	public static String StepOverAction_0;
 	public static String StepReturnAction_0;
 	public static String SuspendAction_0;
 	public static String TerminateAction_0;
 	
+	public static String PBreakpointWorkbenchAdapterFactory_0;
+	public static String PBreakpointWorkbenchAdapterFactory_1;
+
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/messages/messages.properties b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/messages/messages.properties
index aff9e91..6752e24 100644
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/messages/messages.properties
+++ b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/messages/messages.properties
@@ -10,3 +10,5 @@
 StepReturnAction_0=Step Return Group
 SuspendAction_0=Suspend Group
 TerminateAction_0=Terminate Group
+PBreakpointWorkbenchAdapterFactory_0=PTP breakpoint
+PBreakpointWorkbenchAdapterFactory_1=PTP watchpoint