[jbosstools-commits] JBoss Tools SVN: r14536 - in trunk: jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/internal and 1 other directories.

Author: sflanigan Date: 2009-04-07 02:05:59 -0400 (Tue, 07 Apr 2009) New Revision: 14536 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/DebugMessages.java trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/DebugMessages.properties trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/internal/JspLineBreakpoint.java trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionAttrForwardBreakpoint.java trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionEnterBreakpoint.java trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionExceptionBreakpoint.java trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionFormPopulateBreakpoint.java trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionFormValidateBreakpoint.java trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionForwardBreakpoint.java trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionIncludeBreakpoint.java trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionTilesDefinitionForwardBreakpoint.java trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/GlobalExceptionBreakpoint.java trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/GlobalForwardBreakpoint.java trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/PageEnterBreakpoint.java trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/TilesDefinitionGlobalForwardBreakpoint.java Log: JBIDE-3557 Externalise English strings - converted DebugMessages to new-style Eclipse message bundle Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/DebugMessages.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/DebugMessages.java 2009-04-07 05:56:07 UTC (rev 14535) +++ trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/DebugMessages.java 2009-04-07 06:05:59 UTC (rev 14536) @@ -10,33 +10,40 @@ ******************************************************************************/ package org.jboss.tools.jst.web.debug; -import java.text.MessageFormat; -import java.util.MissingResourceException; import java.util.ResourceBundle; -public class DebugMessages { +import org.eclipse.osgi.util.NLS; - private static final String RESOURCE_BUNDLE = "org.jboss.tools.jst.web.debug.DebugMessages"; +public final class DebugMessages extends NLS { - private static ResourceBundle resourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE); + private static final String BUNDLE_NAME = "org.jboss.tools.jst.web.debug.DebugMessages";//$NON-NLS-1$ private DebugMessages() { + // Do not instantiate } - public static String getString(String key) { - try { - return resourceBundle.getString(key); - } catch (MissingResourceException e) { - WebDebugPlugin.getPluginLog().logError(e); - return "%"+key+"%"; - } + public static String ActionEnterBreakpoint_name; + public static String ActionFormPopulateBreakpoint_name; + public static String ActionFormValidateBreakpoint_name; + public static String ActionForwardBreakpoint_name; + public static String ActionTilesDefinitionForwardBreakpoint_name; + public static String ActionIncludeBreakpoint_name; + public static String ActionExceptionBreakpoint_name; + public static String GlobalExceptionBreakpoint_name; + public static String GlobalForwardBreakpoint_name; + public static String TilesDefinitionGlobalForwardBreakpoint_name; + public static String PageEnterBreakpoint_name; + public static String JspLineBreakpoint_name; + + static { + NLS.initializeMessages(BUNDLE_NAME, DebugMessages.class); } - public static String getString(String key, String[] args) { - return MessageFormat.format(getString(key), args); - } - + /** + * @deprecated use the string fields of the NLS subclass + */ public static ResourceBundle getResourceBundle() { - return resourceBundle; + return ResourceBundle.getBundle(BUNDLE_NAME); } + } \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/DebugMessages.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/DebugMessages.properties 2009-04-07 05:56:07 UTC (rev 14535) +++ trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/DebugMessages.properties 2009-04-07 06:05:59 UTC (rev 14536) @@ -1,14 +1,15 @@ # Breakpoints # These messages are used in org.jboss.tools.struts.debug.internal.*Breakpoint. -ActionEnterBreakpoint.name = {0} [action: {1}] - Before execution -ActionFormPopulateBreakpoint.name = {0} [action: {1}] - After form filling -ActionFormValidateBreakpoint.name = {0} [action: {1}] - After form validating -ActionForwardBreakpoint.name = {0} [action: {1}] - success [forward: {2}] -ActionTilesDefinitionForwardBreakpoint.name = {0} [action: {1}] - success [forward: {2}] -ActionIncludeBreakpoint.name = {0} [action: {1}] - success [include: {2}] -ActionExceptionBreakpoint.name = {0} [action: {1}] - {2} -GlobalExceptionBreakpoint.name = {0} [global-exception: {1}] -GlobalForwardBreakpoint.name = {0} [global-forward: {1}] -TilesDefinitionGlobalForwardBreakpoint.name = {0} [global-forward: {1}] -PageEnterBreakpoint.name = {0} [entry] -JspLineBreakpoint.name = {0} [line: {1}] \ No newline at end of file +# and org.jboss.tools.jst.web.debug.internal.JspLineBreakpoint +ActionEnterBreakpoint_name = {0} [action: {1}] - Before execution +ActionFormPopulateBreakpoint_name = {0} [action: {1}] - After form filling +ActionFormValidateBreakpoint_name = {0} [action: {1}] - After form validating +ActionForwardBreakpoint_name = {0} [action: {1}] - success [forward: {2}] +ActionTilesDefinitionForwardBreakpoint_name = {0} [action: {1}] - success [forward: {2}] +ActionIncludeBreakpoint_name = {0} [action: {1}] - success [include: {2}] +ActionExceptionBreakpoint_name = {0} [action: {1}] - {2} +GlobalExceptionBreakpoint_name = {0} [global-exception: {1}] +GlobalForwardBreakpoint_name = {0} [global-forward: {1}] +TilesDefinitionGlobalForwardBreakpoint_name = {0} [global-forward: {1}] +PageEnterBreakpoint_name = {0} [entry] +JspLineBreakpoint_name = {0} [line: {1}] Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/internal/JspLineBreakpoint.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/internal/JspLineBreakpoint.java 2009-04-07 05:56:07 UTC (rev 14535) +++ trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/internal/JspLineBreakpoint.java 2009-04-07 06:05:59 UTC (rev 14536) @@ -20,6 +20,7 @@ import org.eclipse.jdt.internal.debug.core.breakpoints.JavaPatternBreakpoint; import org.eclipse.jdt.internal.debug.core.model.JDIDebugTarget; import org.eclipse.jdt.internal.debug.core.model.JDIThread; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.jst.web.WebUtils; @@ -147,7 +148,7 @@ public String getLabelText() { try { - return DebugMessages.getString("JspLineBreakpoint.name", new String[]{getPattern(), "" + getLineNumber()}); //$NON-NLS-1$ //$NON-NLS-2$ + return NLS.bind(DebugMessages.JspLineBreakpoint_name, (new String[]{getPattern(), "" + getLineNumber()})); } catch (CoreException e) { ModelPlugin.getPluginLog().logError(e); return "error"; Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionAttrForwardBreakpoint.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionAttrForwardBreakpoint.java 2009-04-07 05:56:07 UTC (rev 14535) +++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionAttrForwardBreakpoint.java 2009-04-07 06:05:59 UTC (rev 14536) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.struts.debug.internal.condition.ActionAttrForwardCondition; import org.jboss.tools.jst.web.debug.DebugMessages; @@ -59,7 +60,7 @@ public String getLabelText() { try { - return DebugMessages.getString("ActionForwardBreakpoint.name", new String[]{getMarker().getResource().getName(), getActionMappingPath(), getForwardName()}); //$NON-NLS-1$ + return NLS.bind(DebugMessages.ActionForwardBreakpoint_name, (new String[]{getMarker().getResource().getName(), getActionMappingPath(), getForwardName()})); } catch (CoreException e) { StrutsDebugPlugin.log(e); return "error"; Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionEnterBreakpoint.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionEnterBreakpoint.java 2009-04-07 05:56:07 UTC (rev 14535) +++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionEnterBreakpoint.java 2009-04-07 06:05:59 UTC (rev 14536) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.jst.web.debug.DebugMessages; @@ -43,7 +44,7 @@ public String getLabelText() { try { - return DebugMessages.getString("ActionEnterBreakpoint.name", new String[]{getMarker().getResource().getName(), getActionMappingPath()}); //$NON-NLS-1$ + return NLS.bind(DebugMessages.ActionEnterBreakpoint_name, (new String[]{getMarker().getResource().getName(), getActionMappingPath()})); } catch (CoreException e) { StrutsDebugPlugin.log(e); return "error"; Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionExceptionBreakpoint.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionExceptionBreakpoint.java 2009-04-07 05:56:07 UTC (rev 14535) +++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionExceptionBreakpoint.java 2009-04-07 06:05:59 UTC (rev 14536) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.struts.debug.internal.condition.ActionExceptionCondition; import org.jboss.tools.jst.web.debug.DebugMessages; @@ -63,7 +64,7 @@ public String getLabelText() { try { - return DebugMessages.getString("ActionExceptionBreakpoint.name", new String[]{getMarker().getResource().getName(), getActionMappingPath(), getExceptionTypeName()}); //$NON-NLS-1$ + return NLS.bind(DebugMessages.ActionExceptionBreakpoint_name, (new String[]{getMarker().getResource().getName(), getActionMappingPath(), getExceptionTypeName()})); } catch (CoreException e) { StrutsDebugPlugin.log(e); return "error"; Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionFormPopulateBreakpoint.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionFormPopulateBreakpoint.java 2009-04-07 05:56:07 UTC (rev 14535) +++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionFormPopulateBreakpoint.java 2009-04-07 06:05:59 UTC (rev 14536) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.jst.web.debug.DebugMessages; @@ -44,7 +45,7 @@ public String getLabelText() { try { - return DebugMessages.getString("ActionFormPopulateBreakpoint.name", new String[]{getMarker().getResource().getName(), getActionMappingPath()}); //$NON-NLS-1$ + return NLS.bind(DebugMessages.ActionFormPopulateBreakpoint_name, (new String[]{getMarker().getResource().getName(), getActionMappingPath()})); } catch (CoreException e) { StrutsDebugPlugin.log(e); return "error"; Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionFormValidateBreakpoint.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionFormValidateBreakpoint.java 2009-04-07 05:56:07 UTC (rev 14535) +++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionFormValidateBreakpoint.java 2009-04-07 06:05:59 UTC (rev 14536) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.jst.web.debug.DebugMessages; @@ -43,7 +44,7 @@ public String getLabelText() { try { - return DebugMessages.getString("ActionFormValidateBreakpoint.name", new String[]{getMarker().getResource().getName(), getActionMappingPath()}); //$NON-NLS-1$ + return NLS.bind(DebugMessages.ActionFormValidateBreakpoint_name, (new String[]{getMarker().getResource().getName(), getActionMappingPath()})); } catch (CoreException e) { StrutsDebugPlugin.log(e); return "error"; Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionForwardBreakpoint.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionForwardBreakpoint.java 2009-04-07 05:56:07 UTC (rev 14535) +++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionForwardBreakpoint.java 2009-04-07 06:05:59 UTC (rev 14536) @@ -18,6 +18,7 @@ import org.eclipse.debug.core.DebugException; import org.eclipse.jdt.internal.debug.core.model.JDIStackFrame; import org.eclipse.jdt.internal.debug.core.model.JDIThread; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.struts.debug.internal.condition.ActionForwardCondition; import org.jboss.tools.jst.web.debug.DebugMessages; @@ -85,7 +86,7 @@ public String getLabelText() { try { - return DebugMessages.getString("ActionForwardBreakpoint.name", new String[]{getMarker().getResource().getName(), getActionMappingPath(), getForwardName()}); //$NON-NLS-1$ + return NLS.bind(DebugMessages.ActionForwardBreakpoint_name, (new String[]{getMarker().getResource().getName(), getActionMappingPath(), getForwardName()})); } catch (CoreException e) { StrutsDebugPlugin.log(e); return "error"; Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionIncludeBreakpoint.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionIncludeBreakpoint.java 2009-04-07 05:56:07 UTC (rev 14535) +++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionIncludeBreakpoint.java 2009-04-07 06:05:59 UTC (rev 14536) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.struts.debug.internal.condition.ActionIncludeCondition; import org.jboss.tools.jst.web.debug.DebugMessages; @@ -58,7 +59,7 @@ public String getLabelText() { try { - return DebugMessages.getString("ActionIncludeBreakpoint.name", new String[]{getMarker().getResource().getName(), getActionMappingPath(), getIncludeName()}); //$NON-NLS-1$ + return NLS.bind(DebugMessages.ActionIncludeBreakpoint_name, (new String[]{getMarker().getResource().getName(), getActionMappingPath(), getIncludeName()})); } catch (CoreException e) { StrutsDebugPlugin.log(e); return "error"; Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionTilesDefinitionForwardBreakpoint.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionTilesDefinitionForwardBreakpoint.java 2009-04-07 05:56:07 UTC (rev 14535) +++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionTilesDefinitionForwardBreakpoint.java 2009-04-07 06:05:59 UTC (rev 14536) @@ -18,6 +18,7 @@ import org.eclipse.debug.core.DebugException; import org.eclipse.jdt.internal.debug.core.model.JDIStackFrame; import org.eclipse.jdt.internal.debug.core.model.JDIThread; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.jst.web.debug.DebugMessages; @@ -59,7 +60,7 @@ public String getLabelText() { try { - return DebugMessages.getString("ActionTilesDefinitionForwardBreakpoint.name", new String[]{getMarker().getResource().getName(), getActionMappingPath(), getForwardName()}); //$NON-NLS-1$ + return NLS.bind(DebugMessages.ActionTilesDefinitionForwardBreakpoint_name, (new String[]{getMarker().getResource().getName(), getActionMappingPath(), getForwardName()})); } catch (CoreException e) { StrutsDebugPlugin.log(e); return "error"; Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/GlobalExceptionBreakpoint.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/GlobalExceptionBreakpoint.java 2009-04-07 05:56:07 UTC (rev 14535) +++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/GlobalExceptionBreakpoint.java 2009-04-07 06:05:59 UTC (rev 14536) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.struts.debug.internal.condition.GlobalExceptionCondition; import org.jboss.tools.jst.web.debug.DebugMessages; @@ -42,7 +43,7 @@ public String getLabelText() { try { - return DebugMessages.getString("GlobalExceptionBreakpoint.name", new String[]{getMarker().getResource().getName(), getExceptionTypeName()}); //$NON-NLS-1$ + return NLS.bind(DebugMessages.GlobalExceptionBreakpoint_name, (new String[]{getMarker().getResource().getName(), getExceptionTypeName()})); } catch (CoreException e) { StrutsDebugPlugin.log(e); return "error"; Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/GlobalForwardBreakpoint.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/GlobalForwardBreakpoint.java 2009-04-07 05:56:07 UTC (rev 14535) +++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/GlobalForwardBreakpoint.java 2009-04-07 06:05:59 UTC (rev 14536) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.struts.debug.internal.condition.GlobalForwardCondition; import org.jboss.tools.jst.web.debug.DebugMessages; @@ -38,7 +39,7 @@ public String getLabelText() { try { - return DebugMessages.getString("GlobalForwardBreakpoint.name", new String[]{getMarker().getResource().getName(), getForwardName()}); //$NON-NLS-1$ + return NLS.bind(DebugMessages.GlobalForwardBreakpoint_name, (new String[]{getMarker().getResource().getName(), getForwardName()})); } catch (CoreException e) { StrutsDebugPlugin.log(e); return "error"; Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/PageEnterBreakpoint.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/PageEnterBreakpoint.java 2009-04-07 05:56:07 UTC (rev 14535) +++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/PageEnterBreakpoint.java 2009-04-07 06:05:59 UTC (rev 14536) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.jst.web.debug.internal.JspLineBreakpoint; import org.jboss.tools.jst.web.debug.DebugMessages; @@ -29,7 +30,7 @@ public String getLabelText() { try { - return DebugMessages.getString("PageEnterBreakpoint.name", new String[]{getPattern()}); //$NON-NLS-1$ + return NLS.bind(DebugMessages.PageEnterBreakpoint_name, (new String[]{getPattern()})); } catch (CoreException e) { StrutsDebugPlugin.log(e); return "error"; Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/TilesDefinitionGlobalForwardBreakpoint.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/TilesDefinitionGlobalForwardBreakpoint.java 2009-04-07 05:56:07 UTC (rev 14535) +++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/TilesDefinitionGlobalForwardBreakpoint.java 2009-04-07 06:05:59 UTC (rev 14536) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.struts.debug.internal.condition.GlobalForwardCondition; import org.jboss.tools.jst.web.debug.DebugMessages; @@ -41,7 +42,7 @@ public String getLabelText() { try { - return DebugMessages.getString("TilesDefinitionGlobalForwardBreakpoint.name", new String[]{getMarker().getResource().getName(), getForwardName()}); //$NON-NLS-1$ + return NLS.bind(DebugMessages.TilesDefinitionGlobalForwardBreakpoint_name, (new String[]{getMarker().getResource().getName(), getForwardName()})); } catch (CoreException e) { StrutsDebugPlugin.log(e); return "error";