Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ private Object findSourceElement(IStackFrame stackFrame) {
// prompt
TwoPaneElementSelector dialog = new TwoPaneElementSelector(JDIDebugUIPlugin.getActiveWorkbenchShell(), new SourceElementLabelProvider(),new SourceElementQualifierProvider());
dialog.setTitle(DebugUIMessages.JavaUISourceLocator_Select_Source_1);
dialog.setMessage(NLS.bind(DebugUIMessages.JavaUISourceLocator__Select_the_source_that_corresponds_to__0__2, new String[]{type.getName()}));
dialog.setMessage(NLS.bind(DebugUIMessages.JavaUISourceLocator__Select_the_source_that_corresponds_to__0__2, type.getName()));
dialog.setElements(sourceElements);
dialog.setMultipleSelection(false);
dialog.setUpperListLabel(DebugUIMessages.JavaUISourceLocator__Matching_files__3);
Expand Down Expand Up @@ -250,7 +250,7 @@ private void showDebugSourcePage(final IJavaStackFrame frame) {
@Override
public void run() {
try {
String message = NLS.bind(LauncherMessages.JavaUISourceLocator_selectprojects_message, new String[] {frame.getDeclaringTypeName()});
String message = NLS.bind(LauncherMessages.JavaUISourceLocator_selectprojects_message, frame.getDeclaringTypeName());

ILaunchConfiguration configuration =
frame.getLaunch().getLaunchConfiguration();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ protected void nameChanged(String newName, boolean init) {
} else {
IStatus s = ResourcesPlugin.getWorkspace().validateName(newName, IResource.FILE);
if (!s.isOK()) {
fNameStatus = new Status(IStatus.ERROR, JDIDebugUIPlugin.getUniqueIdentifier(), NLS.bind(JREMessages.AddVMDialog_JRE_name_must_be_a_valid_file_name___0__1, new String[]{s.getMessage()}));
fNameStatus = new Status(IStatus.ERROR, JDIDebugUIPlugin.getUniqueIdentifier(), NLS.bind(JREMessages.AddVMDialog_JRE_name_must_be_a_valid_file_name___0__1, s.getMessage()));
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -494,15 +494,15 @@ public boolean isValid(ILaunchConfiguration launchConfig) {
if (status.isOK()) {
IProject project= ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
if (!project.exists()) {
setErrorMessage(NLS.bind(LauncherMessages.JavaMainTab_20, new String[] {projectName}));
setErrorMessage(NLS.bind(LauncherMessages.JavaMainTab_20, projectName));
return false;
}
if (!project.isOpen()) {
setErrorMessage(NLS.bind(LauncherMessages.JavaMainTab_21, new String[] {projectName}));
setErrorMessage(NLS.bind(LauncherMessages.JavaMainTab_21, projectName));
return false;
}
} else {
setErrorMessage(NLS.bind(LauncherMessages.JavaMainTab_19, new String[]{status.getMessage()}));
setErrorMessage(NLS.bind(LauncherMessages.JavaMainTab_19, status.getMessage()));
return false;
}
}
Expand All @@ -513,14 +513,14 @@ public boolean isValid(ILaunchConfiguration launchConfig) {
type = entries[i].getType();
if (type == IRuntimeClasspathEntry.ARCHIVE) {
if(!entries[i].getPath().isAbsolute()) {
setErrorMessage(NLS.bind(LauncherMessages.JavaClasspathTab_Invalid_runtime_classpath_1, new String[]{entries[i].getPath().toString()}));
setErrorMessage(NLS.bind(LauncherMessages.JavaClasspathTab_Invalid_runtime_classpath_1, entries[i].getPath().toString()));
return false;
}
}
if(type == IRuntimeClasspathEntry.PROJECT) {
IResource res = entries[i].getResource();
if(res != null && !res.isAccessible()) {
setErrorMessage(NLS.bind(LauncherMessages.JavaClasspathTab_1, new String[]{res.getName()}));
setErrorMessage(NLS.bind(LauncherMessages.JavaClasspathTab_1, res.getName()));
return false;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -533,15 +533,15 @@ public boolean isValid(ILaunchConfiguration launchConfig) {
if (status.isOK()) {
IProject project= ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
if (!project.exists()) {
setErrorMessage(NLS.bind(LauncherMessages.JavaMainTab_20, new String[] {projectName}));
setErrorMessage(NLS.bind(LauncherMessages.JavaMainTab_20, projectName));
return false;
}
if (!project.isOpen()) {
setErrorMessage(NLS.bind(LauncherMessages.JavaMainTab_21, new String[] {projectName}));
setErrorMessage(NLS.bind(LauncherMessages.JavaMainTab_21, projectName));
return false;
}
} else {
setErrorMessage(NLS.bind(LauncherMessages.JavaMainTab_19, new String[]{status.getMessage()}));
setErrorMessage(NLS.bind(LauncherMessages.JavaMainTab_19, status.getMessage()));
return false;
}
}
Expand All @@ -552,14 +552,14 @@ public boolean isValid(ILaunchConfiguration launchConfig) {
type = entries[i].getType();
if (type == IRuntimeClasspathEntry.ARCHIVE) {
if(!entries[i].getPath().isAbsolute()) {
setErrorMessage(NLS.bind(LauncherMessages.JavaClasspathTab_Invalid_runtime_classpath_1, new String[]{entries[i].getPath().toString()}));
setErrorMessage(NLS.bind(LauncherMessages.JavaClasspathTab_Invalid_runtime_classpath_1, entries[i].getPath().toString()));
return false;
}
}
if(type == IRuntimeClasspathEntry.PROJECT) {
IResource res = entries[i].getResource();
if(res != null && !res.isAccessible()) {
setErrorMessage(NLS.bind(LauncherMessages.JavaClasspathTab_1, new String[]{res.getName()}));
setErrorMessage(NLS.bind(LauncherMessages.JavaClasspathTab_1, res.getName()));
return false;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ public String getDescription() {
if (vm != null) {
name = vm.getName();
}
return NLS.bind(LauncherMessages.JavaJRETab_8, new String[]{name});
return NLS.bind(LauncherMessages.JavaJRETab_8, name);
}
try {
String eeName = null;
Expand All @@ -599,11 +599,11 @@ public String getDescription() {
name = vm.getName();
}
if (eeName != null) {
return NLS.bind(LauncherMessages.JavaJRETab_5, new String[]{eeName, name});
return NLS.bind(LauncherMessages.JavaJRETab_5, eeName, name);
}
} catch (CoreException e) {
}
return NLS.bind(LauncherMessages.JavaJRETab_9, new String[]{name});
return NLS.bind(LauncherMessages.JavaJRETab_9, name);
}
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,16 +199,16 @@ public boolean isValid(ILaunchConfiguration config) {
if (status.isOK()) {
IProject project= ResourcesPlugin.getWorkspace().getRoot().getProject(name);
if (!project.exists()) {
setErrorMessage(NLS.bind(LauncherMessages.JavaMainTab_20, new String[] {name}));
setErrorMessage(NLS.bind(LauncherMessages.JavaMainTab_20, name));
return false;
}
if (!project.isOpen()) {
setErrorMessage(NLS.bind(LauncherMessages.JavaMainTab_21, new String[] {name}));
setErrorMessage(NLS.bind(LauncherMessages.JavaMainTab_21, name));
return false;
}
}
else {
setErrorMessage(NLS.bind(LauncherMessages.JavaMainTab_19, new String[]{status.getMessage()}));
setErrorMessage(NLS.bind(LauncherMessages.JavaMainTab_19, status.getMessage()));
return false;
}
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public ClassPrepareBreakpointTypeChange(IJavaClassPrepareBreakpoint breakpoint,
@Override
public String getName() {
return NLS.bind(RefactoringMessages.ClassPrepareBreakpointTypeChange_0,
new String[] {getBreakpointLabel(getOriginalBreakpoint()), fDestType.getElementName()});
getBreakpointLabel(getOriginalBreakpoint()), fDestType.getElementName());
}

/* (non-Javadoc)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public DeleteBreakpointChange(IJavaBreakpoint breakpoint) throws CoreException {
@Override
public String getName() {
return NLS.bind(RefactoringMessages.DeleteBreakpointChange_0,
new String[] {getBreakpointLabel(getOriginalBreakpoint())});
getBreakpointLabel(getOriginalBreakpoint()));
}

/* (non-Javadoc)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public ExceptionBreakpointTypeChange(IJavaExceptionBreakpoint breakpoint, IType
@Override
public String getName() {
return NLS.bind(RefactoringMessages.ExceptionBreakpointTypeChange_0,
new String[] {getBreakpointLabel(getOriginalBreakpoint()), fDestType.getElementName()});
getBreakpointLabel(getOriginalBreakpoint()), fDestType.getElementName());
}

/* (non-Javadoc)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ public Object getModifiedElement() {
@Override
public String getName() {
if (fNewLaunchConfigurationName != null) {
return NLS.bind(RefactoringMessages.LaunchConfigurationProjectMainTypeChange_0, new String[] {fLaunchConfiguration.getName(), fNewLaunchConfigurationName});
return NLS.bind(RefactoringMessages.LaunchConfigurationProjectMainTypeChange_0, fLaunchConfiguration.getName(), fNewLaunchConfigurationName);
}
if (fNewProjectName == null) {
return NLS.bind(RefactoringMessages.LaunchConfigurationProjectMainTypeChange_1, new String[] {fLaunchConfiguration.getName()});
return NLS.bind(RefactoringMessages.LaunchConfigurationProjectMainTypeChange_1, fLaunchConfiguration.getName());
}
if (fNewMainTypeName == null) {
return NLS.bind(RefactoringMessages.LaunchConfigurationProjectMainTypeChange_2, new String[] {fLaunchConfiguration.getName()});
return NLS.bind(RefactoringMessages.LaunchConfigurationProjectMainTypeChange_2, fLaunchConfiguration.getName());
}
return NLS.bind(RefactoringMessages.LaunchConfigurationProjectMainTypeChange_3, new String[] {fLaunchConfiguration.getName()});
return NLS.bind(RefactoringMessages.LaunchConfigurationProjectMainTypeChange_3, fLaunchConfiguration.getName());
}

/* (non-Javadoc)
Expand All @@ -113,17 +113,17 @@ public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException, Oper
if (fOldProjectName.equals(projectName)) {
return new RefactoringStatus();
}
return RefactoringStatus.createWarningStatus(NLS.bind(RefactoringMessages.LaunchConfigurationProjectMainTypeChange_4, new String[] {fLaunchConfiguration.getName(), fOldProjectName}));
return RefactoringStatus.createWarningStatus(NLS.bind(RefactoringMessages.LaunchConfigurationProjectMainTypeChange_4, fLaunchConfiguration.getName(), fOldProjectName));
}
return RefactoringStatus.createWarningStatus(NLS.bind(RefactoringMessages.LaunchConfigurationProjectMainTypeChange_5, new String[] {fLaunchConfiguration.getName(), fOldMainTypeName}));
return RefactoringStatus.createWarningStatus(NLS.bind(RefactoringMessages.LaunchConfigurationProjectMainTypeChange_5, fLaunchConfiguration.getName(), fOldMainTypeName));
}
//need to catch the case for remote java LC's, they have no maintype
if (fOldProjectName.equals(projectName)) {
return new RefactoringStatus();
}
return RefactoringStatus.createWarningStatus(NLS.bind(RefactoringMessages.LaunchConfigurationProjectMainTypeChange_4, new String[] {fLaunchConfiguration.getName(), fOldProjectName}));
return RefactoringStatus.createWarningStatus(NLS.bind(RefactoringMessages.LaunchConfigurationProjectMainTypeChange_4, fLaunchConfiguration.getName(), fOldProjectName));
}
return RefactoringStatus.createFatalErrorStatus(NLS.bind(RefactoringMessages.LaunchConfigurationProjectMainTypeChange_6, new String[] {fLaunchConfiguration.getName()}));
return RefactoringStatus.createFatalErrorStatus(NLS.bind(RefactoringMessages.LaunchConfigurationProjectMainTypeChange_6, fLaunchConfiguration.getName()));
}

/* (non-Javadoc)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ public LineBreakpointTypeChange(IJavaLineBreakpoint breakpoint, IType destType)
*/
@Override
public String getName() {
String msg = NLS.bind(RefactoringMessages.LineBreakpointTypeChange_1, new String[] {getBreakpointLabel(getOriginalBreakpoint())});
String msg = NLS.bind(RefactoringMessages.LineBreakpointTypeChange_1, getBreakpointLabel(getOriginalBreakpoint()));
if(!"".equals(fDestType.getElementName())) { //$NON-NLS-1$
msg = NLS.bind(RefactoringMessages.LineBreakpointTypeChange_0,
new String[] {getBreakpointLabel(getOriginalBreakpoint()), fDestType.getElementName()});
getBreakpointLabel(getOriginalBreakpoint()), fDestType.getElementName());
}
return msg;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public MethodBreakpointMethodChange(IJavaMethodBreakpoint breakpoint, IMethod de
@Override
public String getName() {
return NLS.bind(RefactoringMessages.MethodBreakpointMethodChange_0,
new String[] {getBreakpointLabel(getOriginalBreakpoint()), fDestMethod.getElementName()});
getBreakpointLabel(getOriginalBreakpoint()), fDestMethod.getElementName());
}

/* (non-Javadoc)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ public MethodBreakpointTypeChange(IJavaMethodBreakpoint breakpoint, IType destTy
*/
@Override
public String getName() {
String msg = NLS.bind(RefactoringMessages.MethodBreakpointTypeChange_1, new String[] {getBreakpointLabel(getOriginalBreakpoint())});
String msg = NLS.bind(RefactoringMessages.MethodBreakpointTypeChange_1, getBreakpointLabel(getOriginalBreakpoint()));
if(!"".equals(fDestType.getElementName())) { //$NON-NLS-1$
msg = NLS.bind(RefactoringMessages.MethodBreakpointTypeChange_0,
new String[] {getBreakpointLabel(getOriginalBreakpoint()), fDestType.getElementName()});
getBreakpointLabel(getOriginalBreakpoint()), fDestType.getElementName());
}
return msg;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public WatchpointFieldChange(IJavaWatchpoint watchpoint, IField destField) throw
@Override
public String getName() {
return NLS.bind(RefactoringMessages.WatchpointFieldChange_0,
new String[] {getBreakpointLabel(getOriginalBreakpoint()), fDestField.getElementName()});
getBreakpointLabel(getOriginalBreakpoint()), fDestField.getElementName());
}

/* (non-Javadoc)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ public WatchpointTypeChange(IJavaWatchpoint watchpoint, IType destType, IType or
*/
@Override
public String getName() {
String msg = NLS.bind(RefactoringMessages.WatchpointTypeChange_1, new String[] {getBreakpointLabel(getOriginalBreakpoint())});
String msg = NLS.bind(RefactoringMessages.WatchpointTypeChange_1, getBreakpointLabel(getOriginalBreakpoint()));
if(!"".equals(fDestType.getElementName())) { //$NON-NLS-1$
msg = NLS.bind(RefactoringMessages.WatchpointTypeChange_0,
new String[] {getBreakpointLabel(getOriginalBreakpoint()), fDestType.getElementName()});
getBreakpointLabel(getOriginalBreakpoint()), fDestType.getElementName());
}
return msg;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ public void handleEvent(Event e) {
IBindingService bindingService = workbench.getAdapter(IBindingService.class);
String binding = bindingService.getBestActiveBindingFormattedFor(IWorkbenchCommandConstants.EDIT_CONTENT_ASSIST);
if (binding != null) {
labelText = NLS.bind(DebugUIMessages.DetailFormatterDialog_17, new String[] { binding });
labelText = NLS.bind(DebugUIMessages.DetailFormatterDialog_17, binding);
}
if (labelText == null) {
labelText = DebugUIMessages.DetailFormatterDialog_Detail_formatter__code_snippet__1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ public void checkValues() {
}
if (variable[1].trim().length() == 0) {
if (!oneElementSelected || fCurrentAttributeSelection.getFirstElement() != variable) {
status.setError(NLS.bind(DebugUIMessages.EditLogicalStructureDialog_23, new String[] {variable[0]}));
status.setError(NLS.bind(DebugUIMessages.EditLogicalStructureDialog_23, variable[0]));
break;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ public String getValueText(IJavaValue value) throws DebugException {
if (value instanceof IJavaObject) {
String label = ((IJavaObject) value).getLabel();
if (label != null) {
buffer.append(NLS.bind(DebugUIMessages.JDIModelPresentation_7, new String[] { label }));
buffer.append(NLS.bind(DebugUIMessages.JDIModelPresentation_7, label));
}
}
if(isUnknown(signature)) {
Expand Down Expand Up @@ -533,7 +533,7 @@ public String getValueText(IJavaValue value) throws DebugException {
buffer.append('"');
if(value instanceof IJavaObject){
buffer.append(" "); //$NON-NLS-1$
buffer.append(NLS.bind(DebugUIMessages.JDIModelPresentation_118, new String[]{String.valueOf(((IJavaObject)value).getUniqueId())}));
buffer.append(NLS.bind(DebugUIMessages.JDIModelPresentation_118, String.valueOf(((IJavaObject) value).getUniqueId())));
}
}

Expand Down Expand Up @@ -1274,7 +1274,7 @@ protected String getVariableText(IJavaVariable var) {
if (isDuplicateName(field)) {
try {
String decl = field.getDeclaringType().getName();
buff.append(NLS.bind(" ({0})", new String[]{getQualifiedName(decl)})); //$NON-NLS-1$
buff.append(NLS.bind(" ({0})", getQualifiedName(decl))); //$NON-NLS-1$
} catch (DebugException e) {
}
}
Expand Down Expand Up @@ -2049,7 +2049,7 @@ protected void appendInstanceFilter(IJavaBreakpoint breakpoint, StringBuilder bu
String instanceText= instances[i].getValueString();
if (instanceText != null) {
buffer.append(' ');
buffer.append(NLS.bind(DebugUIMessages.JDIModelPresentation_instance_1, new String[] {instanceText}));
buffer.append(NLS.bind(DebugUIMessages.JDIModelPresentation_instance_1, instanceText));
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@ private void openConditionErrorDialog(final IJavaLineBreakpoint breakpoint, fina
if (display.isDisposed()) {
return;
}
final String message= NLS.bind(errorMessage, new String[] {fLabelProvider.getText(breakpoint)});
final String message = NLS.bind(errorMessage, fLabelProvider.getText(breakpoint));
display.asyncExec(new Runnable() {
@Override
public void run() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ public void evaluationComplete(IEvaluationResult result) {
Throwable throwable= exception.getStatus().getException();
error.append("\n\t\t"); //$NON-NLS-1$
if (throwable instanceof InvocationException) {
error.append(NLS.bind(DebugUIMessages.JavaDetailFormattersManager_An_exception_occurred___0__3, new String[] {((InvocationException) throwable).exception().referenceType().name()}));
error.append(NLS.bind(DebugUIMessages.JavaDetailFormattersManager_An_exception_occurred___0__3, ((InvocationException) throwable).exception().referenceType().name()));
} else if (throwable instanceof UnsupportedOperationException) {
error = new StringBuilder();
error.append(DebugUIMessages.JavaDetailFormattersManager_7);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ else if (columnIndex == 1) {
buffer.append(logicalStructure.getDescription());
String pluginId= logicalStructure.getContributingPluginId();
if (pluginId != null) {
buffer.append(NLS.bind(DebugUIMessages.JavaLogicalStructuresPreferencePage_8, new String[] {pluginId}));
buffer.append(NLS.bind(DebugUIMessages.JavaLogicalStructuresPreferencePage_8, pluginId));
}
}
return buffer.toString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public Object handleStatus(IStatus status, Object source) {
public void run() {
final ErrorDialogWithToggle dialog = new ErrorDialogWithToggle(PlatformUI.getWorkbench().getModalDialogShellProvider().getShell(),
DebugUIMessages.NoLineNumberAttributesStatusHandler_Java_Breakpoint_1,
NLS.bind(DebugUIMessages.NoLineNumberAttributesStatusHandler_2, new String[] {type.name()}),
NLS.bind(DebugUIMessages.NoLineNumberAttributesStatusHandler_2, type.name()),
status, IJDIPreferencesConstants.PREF_ALERT_UNABLE_TO_INSTALL_BREAKPOINT,
DebugUIMessages.NoLineNumberAttributesStatusHandler_3,
preferenceStore);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ public Object handleStatus(IStatus status, Object source) throws CoreException {
display.syncExec(new Runnable() {
@Override
public void run() {
final ErrorDialog dialog= new ErrorDialog(PlatformUI.getWorkbench().getModalDialogShellProvider().getShell(), DebugUIMessages.SuspendTimeoutHandler_suspend, NLS.bind(DebugUIMessages.SuspendTimeoutHandler_timeout_occurred, new String[] {threadName}), status, IStatus.WARNING | IStatus.ERROR | IStatus.INFO); //
final ErrorDialog dialog = new ErrorDialog(PlatformUI.getWorkbench().getModalDialogShellProvider().getShell(), DebugUIMessages.SuspendTimeoutHandler_suspend, NLS.bind(DebugUIMessages.SuspendTimeoutHandler_timeout_occurred, threadName), status, IStatus.WARNING
| IStatus.ERROR | IStatus.INFO); //
dialog.open();
}
});
Expand Down
Loading
Loading