[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-patch] Externalizing strings in debug-ui patch
|
These are the remaining strings in the
debug ui plugin to be externalized.
Thanks,
Tanya
Index: ChangeLog
===================================================================
retrieving revision 1.218
diff -u -r1.218 ChangeLog
--- ChangeLog 12 Mar 2004 16:42:31 -0000 1.218
+++ ChangeLog 16 Mar 2004 23:38:26 -0000
@@ -1,4 +1,12 @@
2004-03-11 Tanya Wolff
+ Externalized remaining strings
+ * debug.internal.ui
+ * debug.internal.ui.actions
+ * debug.internal.ui.editors
+ * debug.ui
+ * debug.ui.sourcelookup
+
+2004-03-11 Tanya Wolff
Fix for missing resource in
* LoadSymbolsForAllAction.java
Index: src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java
===================================================================
retrieving revision 1.77
diff -u -r1.77 CDTDebugModelPresentation.java
--- src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java 4 Mar 2004 19:23:14 -0000 1.77
+++ src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java 16 Mar 2004 23:38:30 -0000
@@ -386,7 +386,7 @@
{
if ( ((ITerminate)element).isTerminated() )
{
- label.insert( 0, "<terminated>" );
+ label.insert( 0, CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.terminated") ); //$NON-NLS-1$
return label.toString();
}
}
@@ -394,7 +394,7 @@
{
if ( ((IDisconnect)element).isDisconnected() )
{
- label.insert( 0, "<disconnected>" );
+ label.insert( 0, CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.disconnected") ); //$NON-NLS-1$
return label.toString();
}
}
@@ -406,7 +406,7 @@
}
catch( DebugException e )
{
- return "<not_responding>";
+ return CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.not_responding"); //$NON-NLS-1$
}
catch( CoreException e )
{
@@ -440,21 +440,22 @@
case IState.EXITED:
{
Object info = state.getCurrentStateInfo();
- String label = target.getName() + " (Exited";
+ String label = target.getName() + CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.Exited"); //$NON-NLS-1$
if ( info != null && info instanceof ICDISignalExitInfo)
{
ICDISignalExitInfo sigInfo = (ICDISignalExitInfo)info;
- label += MessageFormat.format( ": Signal ''{0}'' received. Description: {1}.",
+ label += CDebugUIPlugin.getFormattedString("CDTDebugModelPresentation.Signal_received_Description", //$NON-NLS-1$//$NON-NLS-2$
new String[] { sigInfo.getName(), sigInfo.getDescription() } );
}
else if ( info != null && info instanceof ICDIExitInfo )
{
- label += ". Exit code = " + ((ICDIExitInfo)info).getCode();
+ label += CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.Exit_code") + ((ICDIExitInfo)info).getCode(); //$NON-NLS-1$//$NON-NLS-2$
}
- return label + ")"; //$NON-NLS-1$
+ return label + CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.closeBracket"); //$NON-NLS-1$
}
case IState.SUSPENDED:
- return target.getName() + " (Suspended)";
+ return target.getName() + CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.Suspended") + //$NON-NLS-1$
+ CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.closeBracket"); //$NON-NLS-1$
}
}
return target.getName();
@@ -462,7 +463,7 @@
protected String getThreadText( IThread thread, boolean qualified ) throws DebugException
{
- String threadName = getFormattedString( "Thread [{0}]", thread.getName() );
+ String threadName = getFormattedString( CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.Thread_name"), thread.getName() ); //$NON-NLS-1$
ICDebugTargetType targetType = (ICDebugTargetType)thread.getDebugTarget().getAdapter( ICDebugTargetType.class );
int type = ( targetType != null ) ? targetType.getTargetType() : ICDebugTargetType.TARGET_TYPE_UNKNOWN;
if ( type == ICDebugTargetType.TARGET_TYPE_LOCAL_CORE_DUMP )
@@ -471,15 +472,15 @@
}
if ( thread.isTerminated() )
{
- return getFormattedString( "{0} (Terminated)", threadName );
+ return CDebugUIPlugin.getFormattedString("internal.ui.CDTDebugModelPresentation.threadName_Terminated", threadName ); //$NON-NLS-1$
}
if ( thread.isStepping() )
{
- return getFormattedString( "{0} (Stepping)", threadName );
+ return CDebugUIPlugin.getFormattedString("internal.ui.CDTDebugModelPresentation.threadName_Stepping", threadName ); //$NON-NLS-1$
}
if ( !thread.isSuspended() )
{
- return getFormattedString( "{0} (Running)", threadName );
+ return CDebugUIPlugin.getFormattedString("internal.ui.CDTDebugModelPresentation.threadName_Running", threadName ); //$NON-NLS-1$
}
if ( thread.isSuspended() )
{
@@ -491,33 +492,34 @@
{
ICDISignal signal = ((ICDISignalReceived)info).getSignal();
String label = threadName +
- MessageFormat.format( " (Suspended: Signal ''{0}'' received. Description: {1})",
+ CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.Suspended") + //$NON-NLS-1$
+ CDebugUIPlugin.getFormattedString("CDTDebugModelPresentation.Signal_received_Description", //$NON-NLS-1$
new String[] { signal.getName(), signal.getDescription() } );
return label;
}
if ( info != null && info instanceof ICDIWatchpointTrigger )
{
String label = threadName +
- MessageFormat.format( " (Suspended: Watchpoint triggered. Old value: ''{0}''. New value: ''{1}'')",
+ CDebugUIPlugin.getFormattedString("CDTDebugModelPresentation.Suspended_Watchpoint_triggered_Old_New", //$NON-NLS-1$
new String[] { ((ICDIWatchpointTrigger)info).getOldValue(),
((ICDIWatchpointTrigger)info).getNewValue() } );
return label;
}
if ( info != null && info instanceof ICDIWatchpointScope )
{
- return threadName + " (Suspended: Watchpoint is out of scope)";
+ return threadName + CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.Suspended_Watchpoint_out_of_scope"); //$NON-NLS-1$
}
if ( info != null && info instanceof ICDIBreakpointHit )
{
- return threadName + " (Suspended: Breakpoint hit)";
+ return threadName + CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.Suspended_Breakpoint_hit"); //$NON-NLS-1$
}
if ( info != null && info instanceof ICDISharedLibraryEvent )
{
- return threadName + " (Suspended: Shared library event)";
+ return threadName + CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.Suspended_Shared_lib_event"); //$NON-NLS-1$
}
}
}
- return getFormattedString( "Thread [{0}] (Suspended)", thread.getName() );
+ return getFormattedString( CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.Thread_threadName_suspended"), thread.getName() ); //$NON-NLS-1$
}
protected String getStackFrameText( IStackFrame stackFrame, boolean qualified ) throws DebugException
@@ -536,15 +538,15 @@
if ( function.length() > 0 )
{
label.append( function );
- label.append( "() " );
+ label.append( "() " ); //$NON-NLS-1$
if ( info.getFile() != null )
{
IPath path = new Path( info.getFile() );
if ( !path.isEmpty() )
{
- label.append( "at " );
+ label.append( CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.at")+" " ); //$NON-NLS-1$ //$NON-NLS-2$
label.append( ( qualified ? path.toOSString() : path.lastSegment() ) );
- label.append( ":" );
+ label.append( ":" ); //$NON-NLS-1$
if ( info.getFrameLineNumber() != 0 )
label.append( info.getFrameLineNumber() );
}
@@ -552,7 +554,7 @@
}
}
if ( isEmpty( function ) )
- label.append( "<symbol is not available>" );
+ label.append( CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.Symbol_not_available") ); //$NON-NLS-1$
return label.toString();
}
return ( stackFrame.getAdapter( IDummyStackFrame.class ) != null ) ?
@@ -598,7 +600,7 @@
}
}
if ( !((ICVariable)var).isEnabled() )
- label.append( "<disabled> " );
+ label.append( CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.disabled") ); //$NON-NLS-1$
String name = var.getName();
if ( name != null )
label.append( name.trim() );
@@ -609,27 +611,27 @@
if ( type != null && type.isCharacter() )
{
if ( valueString.length() == 0 )
- valueString = ".";
- label.append( "= " );
+ valueString = "."; //$NON-NLS-1$
+ label.append( "= " ); //$NON-NLS-1$
label.append( valueString );
}
else if ( type != null && type.isFloatingPointType() )
{
Number floatingPointValue = CDebugUtils.getFloatingPointValue( (ICValue)value );
if ( CDebugUtils.isNaN( floatingPointValue ) )
- valueString = "NAN";
+ valueString = "NAN"; //$NON-NLS-1$
if ( CDebugUtils.isPositiveInfinity( floatingPointValue ) )
- valueString = "Infinity";
+ valueString = CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.Infinity"); //$NON-NLS-1$
if ( CDebugUtils.isNegativeInfinity( floatingPointValue ) )
- valueString = "-Infinity";
- label.append( "= " );
+ valueString = "-"+CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.Infinity"); //$NON-NLS-1$ //$NON-NLS-2$
+ label.append( "= " ); //$NON-NLS-1$
label.append( valueString );
}
else if ( type == null || ( !type.isArray() && !type.isStructure() ) )
{
if ( valueString.length() > 0 )
{
- label.append( "= " );
+ label.append( "= " ); //$NON-NLS-1$
label.append( valueString );
}
}
@@ -798,7 +800,7 @@
if ( lineNumber > 0 )
{
label.append( " [" ); //$NON-NLS-1$
- label.append( "line:" );
+ label.append( CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.line") ); //$NON-NLS-1$
label.append( ' ' );
label.append( lineNumber );
label.append( ']' );
@@ -811,7 +813,7 @@
try
{
long address = Long.parseLong( breakpoint.getAddress() );
- label.append( " [address: " );
+ label.append( CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.address") ); //$NON-NLS-1$
label.append( CDebugUtils.toHexAddressString( address ) );
label.append( ']' );
}
@@ -827,7 +829,7 @@
if ( function != null && function.trim().length() > 0 )
{
label.append( " [" ); //$NON-NLS-1$
- label.append( "function:" );
+ label.append( CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.function") ); //$NON-NLS-1$
label.append( ' ' );
label.append( function.trim() );
label.append( ']' );
@@ -841,7 +843,7 @@
if ( ignoreCount > 0 )
{
label.append( " [" ); //$NON-NLS-1$
- label.append( "ignore count:" ); //$NON-NLS-1$
+ label.append( CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.ignore_count") ); //$NON-NLS-1$
label.append( ' ' );
label.append( ignoreCount );
label.append( ']' );
@@ -854,7 +856,9 @@
String condition = breakpoint.getCondition();
if ( condition != null && condition.length() > 0 )
{
- buffer.append( " if " );
+ buffer.append(' ');
+ buffer.append( CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.if") ); //$NON-NLS-1$
+ buffer.append(' ');
buffer.append( condition );
}
}
@@ -864,7 +868,9 @@
String expression = watchpoint.getExpression();
if ( expression != null && expression.length() > 0 )
{
- label.append( " at \'" );
+ label.append(' ');
+ label.append( CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.at") ); //$NON-NLS-1$
+ label.append( '\'' );
label.append( expression );
label.append( '\'' );
}
Index: src/org/eclipse/cdt/debug/internal/ui/CDebugImageDescriptorRegistry.java
===================================================================
retrieving revision 1.2
diff -u -r1.2 CDebugImageDescriptorRegistry.java
--- src/org/eclipse/cdt/debug/internal/ui/CDebugImageDescriptorRegistry.java 13 Feb 2004 22:06:26 -0000 1.2
+++ src/org/eclipse/cdt/debug/internal/ui/CDebugImageDescriptorRegistry.java 16 Mar 2004 23:38:30 -0000
@@ -63,7 +63,7 @@
if ( result != null )
return result;
- Assert.isTrue( fDisplay == CDebugUIPlugin.getStandardDisplay(), "Allocating image for wrong display" );
+ Assert.isTrue( fDisplay == CDebugUIPlugin.getStandardDisplay(), CDebugUIPlugin.getResourceString("internal.ui.CDebugImageDescriptorRegistry.Allocating_image_for_wrong_display") ); //$NON-NLS-1$
result = descriptor.createImage();
if ( result != null )
fRegistry.put( descriptor, result );
Index: src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointActionDelegate.java
===================================================================
retrieving revision 1.5
diff -u -r1.5 AddWatchpointActionDelegate.java
--- src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointActionDelegate.java 4 Mar 2004 19:23:14 -0000 1.5
+++ src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointActionDelegate.java 16 Mar 2004 23:38:30 -0000
@@ -215,7 +215,7 @@
expression,
true,
0,
- "",
+ "", //$NON-NLS-1$
true );
}
catch( CoreException ce )
Index: src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPreferencePage.java
===================================================================
retrieving revision 1.10
diff -u -r1.10 CBreakpointPreferencePage.java
--- src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPreferencePage.java 4 Mar 2004 19:23:14 -0000 1.10
+++ src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPreferencePage.java 16 Mar 2004 23:38:30 -0000
@@ -312,7 +312,7 @@
else if ( breakpoint instanceof ICAddressBreakpoint )
{
ICAddressBreakpoint abrkpt = (ICAddressBreakpoint)breakpoint;
- String address = "Not available";
+ String address = CDebugUIPlugin.getResourceString("internal.ui.actions.CBreakpointPreferencePage.Not_available"); //$NON-NLS-1$
try
{
address = CDebugUtils.toHexAddressString( Long.parseLong( abrkpt.getAddress() ) );
Index: src/org/eclipse/cdt/debug/internal/ui/actions/CastToArrayActionDelegate.java
===================================================================
retrieving revision 1.6
diff -u -r1.6 CastToArrayActionDelegate.java
--- src/org/eclipse/cdt/debug/internal/ui/actions/CastToArrayActionDelegate.java 4 Mar 2004 19:23:14 -0000 1.6
+++ src/org/eclipse/cdt/debug/internal/ui/actions/CastToArrayActionDelegate.java 16 Mar 2004 23:38:31 -0000
@@ -184,7 +184,7 @@
}
catch( NumberFormatException e )
{
- message = CDebugUIPlugin.getResourceString("internal.ui.actions.CastToArrayActionDelegate.7"); //$NON-NLS-1$
+ message = CDebugUIPlugin.getResourceString("internal.ui.actions.CastToArrayActionDelegate.Invalid_first_index"); //$NON-NLS-1$
enabled = false;
}
if ( enabled )
@@ -192,7 +192,7 @@
String lengthText = fLengthText.getText().trim();
if ( lengthText.length() == 0 )
{
- message = CDebugUIPlugin.getResourceString("internal.ui.actions.CastToArrayActionDelegate.Invalid_first_index"); //$NON-NLS-1$
+ message = CDebugUIPlugin.getResourceString("internal.ui.actions.CastToArrayActionDelegate.Empty_last_index"); //$NON-NLS-1$
enabled = false;
}
else
Index: src/org/eclipse/cdt/debug/internal/ui/actions/CastToTypeActionDelegate.java
===================================================================
retrieving revision 1.6
diff -u -r1.6 CastToTypeActionDelegate.java
--- src/org/eclipse/cdt/debug/internal/ui/actions/CastToTypeActionDelegate.java 4 Mar 2004 19:23:14 -0000 1.6
+++ src/org/eclipse/cdt/debug/internal/ui/actions/CastToTypeActionDelegate.java 16 Mar 2004 23:38:31 -0000
@@ -58,8 +58,8 @@
public CastToTypeDialog( Shell parentShell, String initialValue )
{
super( parentShell,
- CDebugUIPlugin.getResourceString("internal.ui.actions.CastToTypeActionDelegate.Cast_To_Type"),
- CDebugUIPlugin.getResourceString("internal.ui.actions.CastToTypeActionDelegate.Enter_type"),
+ CDebugUIPlugin.getResourceString("internal.ui.actions.CastToTypeActionDelegate.Cast_To_Type"), //$NON-NLS-1$
+ CDebugUIPlugin.getResourceString("internal.ui.actions.CastToTypeActionDelegate.Enter_type"), //$NON-NLS-1$
initialValue, new CastToTypeInputValidator() ); //$NON-NLS-1$ //$NON-NLS-2$
}
Index: src/org/eclipse/cdt/debug/internal/ui/actions/ChangeRegisterValueAction.java
===================================================================
retrieving revision 1.6
diff -u -r1.6 ChangeRegisterValueAction.java
--- src/org/eclipse/cdt/debug/internal/ui/actions/ChangeRegisterValueAction.java 4 Mar 2004 19:23:14 -0000 1.6
+++ src/org/eclipse/cdt/debug/internal/ui/actions/ChangeRegisterValueAction.java 16 Mar 2004 23:38:31 -0000
@@ -58,7 +58,7 @@
public ChangeRegisterValueAction( Viewer viewer )
{
super( viewer, CDebugUIPlugin.getResourceString("internal.ui.actions.ChangeRegisterValueAction.Change_Register_Value") ); //$NON-NLS-1$
- setDescription( "Change Register Value" );
+ setDescription( CDebugUIPlugin.getResourceString("internal.ui.actions.ChangeRegisterValueAction.Change_Register_Value") ); //$NON-NLS-1$
CDebugImages.setLocalImageDescriptors( this, CDebugImages.IMG_LCL_CHANGE_REGISTER_VALUE );
fTree = ((TreeViewer)viewer).getTree();
fTreeEditor = new TreeEditor( fTree );
@@ -132,7 +132,7 @@
}
catch (DebugException de)
{
- CDebugUIPlugin.errorDialog( "Setting the register value failed.", de );
+ CDebugUIPlugin.errorDialog( CDebugUIPlugin.getResourceString("internal.ui.actions.ChangeRegisterValueAction.Setting_register_value_failed"), de ); //$NON-NLS-1$
}
fEditorLabel.setText( varName + "=" ); //$NON-NLS-1$
@@ -207,7 +207,7 @@
catch( DebugException de )
{
cleanup();
- CDebugUIPlugin.errorDialog( "Setting the register value failed.", de );
+ CDebugUIPlugin.errorDialog( CDebugUIPlugin.getResourceString("internal.ui.actions.ChangeRegisterValueAction.Setting_register_value_failed"), de ); //$NON-NLS-1$
return;
}
cleanup();
Index: src/org/eclipse/cdt/debug/internal/ui/actions/EnableDisableBreakpointRulerAction.java
===================================================================
retrieving revision 1.2
diff -u -r1.2 EnableDisableBreakpointRulerAction.java
--- src/org/eclipse/cdt/debug/internal/ui/actions/EnableDisableBreakpointRulerAction.java 4 Mar 2004 19:23:14 -0000 1.2
+++ src/org/eclipse/cdt/debug/internal/ui/actions/EnableDisableBreakpointRulerAction.java 16 Mar 2004 23:38:31 -0000
@@ -54,7 +54,8 @@
try
{
boolean enabled = getBreakpoint().isEnabled();
- setText( enabled ? CDebugUIPlugin.getResourceString("internal.ui.actions.EnableDisableBreakpointRulerAction.Disable_breakpoint") : "&Enable Breakpoint" ); //$NON-NLS-1$
+ setText( enabled ? CDebugUIPlugin.getResourceString("internal.ui.actions.EnableDisableBreakpointRulerAction.Disable_breakpoint") : //$NON-NLS-1$
+ CDebugUIPlugin.getResourceString("internal.ui.actions.EnableDisableBreakpointRulerAction.Enable_Breakpoint") ); //$NON-NLS-1$
}
catch( CoreException ce )
{
Index: src/org/eclipse/cdt/debug/internal/ui/actions/ExpressionDialog.java
===================================================================
retrieving revision 1.6
diff -u -r1.6 ExpressionDialog.java
--- src/org/eclipse/cdt/debug/internal/ui/actions/ExpressionDialog.java 4 Mar 2004 19:23:14 -0000 1.6
+++ src/org/eclipse/cdt/debug/internal/ui/actions/ExpressionDialog.java 16 Mar 2004 23:38:31 -0000
@@ -33,7 +33,7 @@
private Button fBtnOk = null;
private Text fTextExpression;
- private String fExpression = "";
+ private String fExpression = ""; //$NON-NLS-1$
/**
* Constructor for ExpressionDialog.
Index: src/org/eclipse/cdt/debug/internal/ui/actions/ManageBreakpointActionDelegate.java
===================================================================
retrieving revision 1.5
diff -u -r1.5 ManageBreakpointActionDelegate.java
--- src/org/eclipse/cdt/debug/internal/ui/actions/ManageBreakpointActionDelegate.java 4 Mar 2004 19:23:14 -0000 1.5
+++ src/org/eclipse/cdt/debug/internal/ui/actions/ManageBreakpointActionDelegate.java 16 Mar 2004 23:38:31 -0000
@@ -211,7 +211,7 @@
lineNumber,
true,
0,
- "",
+ "", //$NON-NLS-1$
true );
}
}
Index: src/org/eclipse/cdt/debug/internal/ui/actions/ManageFunctionBreakpointActionDelegate.java
===================================================================
retrieving revision 1.2
diff -u -r1.2 ManageFunctionBreakpointActionDelegate.java
--- src/org/eclipse/cdt/debug/internal/ui/actions/ManageFunctionBreakpointActionDelegate.java 4 Mar 2004 19:23:14 -0000 1.2
+++ src/org/eclipse/cdt/debug/internal/ui/actions/ManageFunctionBreakpointActionDelegate.java 16 Mar 2004 23:38:31 -0000
@@ -137,7 +137,7 @@
}
catch( CoreException e )
{
- CDebugUIPlugin.errorDialog( "Cannot add breakpoint", e );
+ CDebugUIPlugin.errorDialog( CDebugUIPlugin.getResourceString("internal.ui.actions.ManageFunctionBreakpointActionDelegate.Cannot_add_breakpoint"), e ); //$NON-NLS-1$
}
}
Index: src/org/eclipse/cdt/debug/internal/ui/actions/VariableFormatActionDelegate.java
===================================================================
retrieving revision 1.8
diff -u -r1.8 VariableFormatActionDelegate.java
--- src/org/eclipse/cdt/debug/internal/ui/actions/VariableFormatActionDelegate.java 4 Mar 2004 19:23:14 -0000 1.8
+++ src/org/eclipse/cdt/debug/internal/ui/actions/VariableFormatActionDelegate.java 16 Mar 2004 23:38:32 -0000
@@ -58,7 +58,7 @@
if ( vars != null && vars.length > 0 )
{
final MultiStatus ms = new MultiStatus( CDebugUIPlugin.getUniqueIdentifier(),
- DebugException.REQUEST_FAILED, "", null );
+ DebugException.REQUEST_FAILED, "", null ); //$NON-NLS-1$
BusyIndicator.showWhile( Display.getCurrent(),
new Runnable()
{
Index: src/org/eclipse/cdt/debug/internal/ui/editors/DisassemblyMarkerAnnotationModel.java
===================================================================
retrieving revision 1.5
diff -u -r1.5 DisassemblyMarkerAnnotationModel.java
--- src/org/eclipse/cdt/debug/internal/ui/editors/DisassemblyMarkerAnnotationModel.java 4 Mar 2004 19:23:14 -0000 1.5
+++ src/org/eclipse/cdt/debug/internal/ui/editors/DisassemblyMarkerAnnotationModel.java 16 Mar 2004 23:38:32 -0000
@@ -34,6 +34,7 @@
import org.eclipse.jface.text.Position;
import org.eclipse.ui.texteditor.AbstractMarkerAnnotationModel;
import org.eclipse.ui.texteditor.MarkerAnnotation;
+import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
/**
* Enter type comment.
@@ -60,7 +61,7 @@
}
catch( CoreException x )
{
- doHandleCoreException( x, "Resource Changed" );
+ doHandleCoreException( x, CDebugUIPlugin.getResourceString("internal.ui.editors.DisassemblyMarkerAnnotationModel.Resource_Changed") ); //$NON-NLS-1$
}
}
}
Index: src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java
===================================================================
retrieving revision 1.28
diff -u -r1.28 CDebugUIPlugin.java
--- src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java 4 Mar 2004 19:23:14 -0000 1.28
+++ src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java 16 Mar 2004 23:38:34 -0000
@@ -58,6 +58,7 @@
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
/**
* The main plugin class to be used in the desktop.
@@ -89,7 +90,7 @@
try
{
resourceBundle =
- ResourceBundle.getBundle( "org.eclipse.cdt.debug.ui.CDebugUIPluginResources" );
+ ResourceBundle.getBundle( "org.eclipse.cdt.debug.ui.CDebugUIPluginResources" ); //$NON-NLS-1$
}
catch( MissingResourceException x )
{
@@ -123,9 +124,9 @@
try {
return bundle.getString( key );
} catch (MissingResourceException e) {
- return "!" + key + "!";
+ return '!' + key + '!';
} catch (NullPointerException e) {
- return "#" + key + "#";
+ return '#' + key + '#';
}
}
public static String getFormattedString(String key, String arg) {
@@ -206,7 +207,7 @@
*/
public static void log( Throwable e )
{
- log( new Status( IStatus.ERROR, getUniqueIdentifier(), ICDebugUIConstants.INTERNAL_ERROR, "Internal Error", e ) );
+ log( new Status( IStatus.ERROR, getUniqueIdentifier(), ICDebugUIConstants.INTERNAL_ERROR, "Internal Error", e ) ); //$NON-NLS-1$
}
/**
@@ -229,7 +230,7 @@
try {
tab = (ILaunchConfigurationTab) configElement.createExecutableExtension("class"); //$NON-NLS-1$
} catch(CoreException ce) {
- log(new Status(IStatus.ERROR, getUniqueIdentifier(), 100, "An error occurred retrieving a C Debugger page", ce));
+ log(new Status(IStatus.ERROR, getUniqueIdentifier(), 100, "An error occurred retrieving a C Debugger page", ce)); //$NON-NLS-1$
}
}
return tab;
@@ -239,7 +240,7 @@
fDebuggerPageMap = new HashMap(10);
IPluginDescriptor descriptor= getDefault().getDescriptor();
- IExtensionPoint extensionPoint= descriptor.getExtensionPoint("CDebuggerPage");
+ IExtensionPoint extensionPoint= descriptor.getExtensionPoint("CDebuggerPage"); //$NON-NLS-1$
IConfigurationElement[] infos= extensionPoint.getConfigurationElements();
for (int i = 0; i < infos.length; i++) {
String id = infos[i].getAttribute("debuggerID"); //$NON-NLS-1$
@@ -253,7 +254,7 @@
Shell shell = getActiveWorkbenchShell();
if ( shell != null )
{
- ErrorDialog.openError( shell, "Error", message, status );
+ ErrorDialog.openError( shell, CDebugUIPlugin.getResourceString("ui.CDebugUIPlugin.Error"), message, status ); //$NON-NLS-1$
}
}
@@ -264,7 +265,7 @@
if ( shell != null )
{
IStatus status = new Status( IStatus.ERROR, getUniqueIdentifier(), ICDebugUIConstants.INTERNAL_ERROR, t.getMessage(), null ); //$NON-NLS-1$
- ErrorDialog.openError( shell, "Error", message, status );
+ ErrorDialog.openError( shell, CDebugUIPlugin.getResourceString("ui.CDebugUIPlugin.Error"), message, status ); //$NON-NLS-1$
}
}
Index: src/org/eclipse/cdt/debug/ui/CDebugUIPluginResources.properties
===================================================================
retrieving revision 1.2
diff -u -r1.2 CDebugUIPluginResources.properties
--- src/org/eclipse/cdt/debug/ui/CDebugUIPluginResources.properties 9 Mar 2004 21:31:28 -0000 1.2
+++ src/org/eclipse/cdt/debug/ui/CDebugUIPluginResources.properties 16 Mar 2004 23:38:34 -0000
@@ -51,8 +51,8 @@
internal.ui.actions.CastToArrayActionDelegate.Start_index=Start index:
internal.ui.actions.CastToArrayActionDelegate.Length=Length:
internal.ui.actions.CastToArrayActionDelegate.First_index_field_must_not_be_empty=The 'First index' field must not be empty.
-internal.ui.actions.CastToArrayActionDelegate.7=Invalid first index.
-internal.ui.actions.CastToArrayActionDelegate.Invalid_first_index=The 'Last index' field must not be empty.
+internal.ui.actions.CastToArrayActionDelegate.Invalid_first_index=Invalid first index.
+internal.ui.actions.CastToArrayActionDelegate.Empty_last_index=The 'Last index' field must not be empty.
internal.ui.actions.CastToArrayActionDelegate.Invalid_last_index.=Invalid last index.
internal.ui.actions.CastToArrayActionDelegate.The_length_must_be_greater_than_0=The length must be greater than 0.
internal.ui.actions.CastToArrayActionDelegate.Unable_to_display_this_variable_as_an_array=Unable to display this variable as an array.
@@ -105,13 +105,17 @@
internal.ui.actions.MemoryFormatAction.Hexadecimal=Hexadecimal
internal.ui.actions.MemoryFormatAction.Signed_Decimal=Signed Decimal
internal.ui.actions.MemoryFormatAction.Unsigned_Decimal=Unsigned Decimal
+internal.ui.actions.ManageFunctionBreakpointActionDelegate.Cannot_add_breakpoint=Cannot add breakpoint
+internal.ui.actions.ChangeRegisterValueAction.Setting_register_value_failed=Setting the register value failed.
+internal.ui.editors.DisassemblyMarkerAnnotationModel.Resource_Changed=Resource Changed
internal.ui.editors.CDebugEditor.C_CPP_File_Editor=C/C++ File Editor
internal.ui.editors.CDebugEditor.Source_not_found=Source not found
internal.ui.editors.CDebugEditor.attach_source_location_instructions=You can attach a new source location by pressing the button below:
internal.ui.editors.CDebugEditor.Attach_Source_button=&Attach Source...
internal.ui.editors.CDebugEditor.Can_not_find_file=Can not find the file ''{0}'' in the specified source locations.
internal.ui.editors.DisassemblyEditorInput.Disassembly=Disassembly
+
internal.ui.preferences.SharedLibrariesViewPreferencePage.Shared_Libraries_View_Settings=Shared Libraries View Settings.
internal.ui.preferences.SharedLibrariesViewPreferencePage.Auto-Refresh_by_default=Auto-Refresh by default
internal.ui.preferences.RegistersViewPreferencePage.Registers_View_Settings=Registers View Settings.
@@ -225,4 +229,32 @@
SignalsViewer.Name=Name
SignalsViewer.Pass=Pass
SignalsViewer.Suspend=Suspend
-SignalsViewer.Description=Description
\ No newline at end of file
+SignalsViewer.Description=Description
+internal.ui.CDTDebugModelPresentation.terminated=<terminated>
+internal.ui.CDTDebugModelPresentation.disconnected=<disconnected>
+internal.ui.CDTDebugModelPresentation.not_responding=<not_responding>
+internal.ui.CDTDebugModelPresentation.Exited=\ (Exited
+internal.ui.CDTDebugModelPresentation.Signal_received_Description=: Signal ''{0}'' received. Description: {1}.
+internal.ui.CDTDebugModelPresentation.Exit_code=. Exit code =
+internal.ui.CDTDebugModelPresentation.closeBracket=)
+internal.ui.CDTDebugModelPresentation.Suspended=\ (Suspended
+internal.ui.CDTDebugModelPresentation.Thread_threadName_suspended=Thread [{0}] (Suspended)
+internal.ui.CDTDebugModelPresentation.Thread_name=Thread [{0}]
+internal.ui.CDTDebugModelPresentation.threadName_Terminated={0} (Terminated)
+internal.ui.CDTDebugModelPresentation.threadName_Stepping={0} (Stepping)
+internal.ui.CDTDebugModelPresentation.threadName_Running={0} (Running)
+internal.ui.CDTDebugModelPresentation.Thread_threadName_suspended=Thread [{0}] (Suspended)
+internal.ui.CDTDebugModelPresentation.Symbol_not_available=<symbol is not available>
+internal.ui.CDTDebugModelPresentation.disabled=<disabled>
+internal.ui.CDTDebugModelPresentation.Infinity=Infinity
+internal.ui.CDTDebugModelPresentation.line=line:
+internal.ui.CDTDebugModelPresentation.function=function:
+internal.ui.CDTDebugModelPresentation.ignore_count=ignore count:
+internal.ui.CDTDebugModelPresentation.if=if
+internal.ui.CDTDebugModelPresentation.at=at
+internal.ui.CDebugImageDescriptorRegistry.Allocating_image_for_wrong_display=Allocating image for wrong display
+ui.CDebugUIPlugin.Error=Error
Index: src/org/eclipse/cdt/debug/ui/sourcelookup/SourceListDialogField.java
===================================================================
retrieving revision 1.4
diff -u -r1.4 SourceListDialogField.java
--- src/org/eclipse/cdt/debug/ui/sourcelookup/SourceListDialogField.java 4 Mar 2004 19:23:14 -0000 1.4
+++ src/org/eclipse/cdt/debug/ui/sourcelookup/SourceListDialogField.java 16 Mar 2004 23:38:34 -0000
@@ -127,8 +127,7 @@
{
if ( element instanceof CDirectorySourceLocation && property.equals( CP_ASSOCIATION ) )
{
- return ( ((CDirectorySourceLocation)element).getAssociation() != null ) ?
+ return ( ((CDirectorySourceLocation)element).getAssociation() != null ) ? ((CDirectorySourceLocation)element).getAssociation().toOSString() : ""; //$NON-NLS-1$
}
if ( element instanceof CDirectorySourceLocation && property.equals( CP_SEARCH_SUBFOLDERS ) )
{
