diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java index 819d7ae513..845cb1b5cb 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java @@ -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); @@ -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(); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AbstractVMInstallPage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AbstractVMInstallPage.java index b020c3ff87..111f3f079a 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AbstractVMInstallPage.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AbstractVMInstallPage.java @@ -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())); } } } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaClasspathTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaClasspathTab.java index c4df4e9249..4ce2dd87e3 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaClasspathTab.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaClasspathTab.java @@ -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; } } @@ -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; } } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaDependenciesTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaDependenciesTab.java index 8e4f3adfe3..b48e2c5d67 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaDependenciesTab.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaDependenciesTab.java @@ -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; } } @@ -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; } } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java index 76d99837c6..6d00ae6d8d 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java @@ -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; @@ -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); } }; } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaMainTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaMainTab.java index 533b0cd42c..0da9ba8eb0 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaMainTab.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaMainTab.java @@ -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 { diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ClassPrepareBreakpointTypeChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ClassPrepareBreakpointTypeChange.java index b4ea221096..abcf71377f 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ClassPrepareBreakpointTypeChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ClassPrepareBreakpointTypeChange.java @@ -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) diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/DeleteBreakpointChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/DeleteBreakpointChange.java index b8f757ca43..bd7912005d 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/DeleteBreakpointChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/DeleteBreakpointChange.java @@ -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) diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ExceptionBreakpointTypeChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ExceptionBreakpointTypeChange.java index 9fde038d6a..71fdbc7bd3 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ExceptionBreakpointTypeChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/ExceptionBreakpointTypeChange.java @@ -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) diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LaunchConfigurationProjectMainTypeChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LaunchConfigurationProjectMainTypeChange.java index 919856a6fe..aa78b5b195 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LaunchConfigurationProjectMainTypeChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LaunchConfigurationProjectMainTypeChange.java @@ -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) @@ -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) diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LineBreakpointTypeChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LineBreakpointTypeChange.java index fd0f432b2d..f598bac966 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LineBreakpointTypeChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/LineBreakpointTypeChange.java @@ -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; } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointMethodChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointMethodChange.java index dd4783f8ed..1bf255eaea 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointMethodChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointMethodChange.java @@ -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) diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointTypeChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointTypeChange.java index d795af92ab..0b52a44526 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointTypeChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/MethodBreakpointTypeChange.java @@ -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; } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointFieldChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointFieldChange.java index 3b5516afec..4fcd979e9b 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointFieldChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointFieldChange.java @@ -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) diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointTypeChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointTypeChange.java index 5b3d035cef..60fe8041a1 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointTypeChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointTypeChange.java @@ -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; } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatterDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatterDialog.java index 56e1afd4a6..b4b2c81589 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatterDialog.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatterDialog.java @@ -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; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EditLogicalStructureDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EditLogicalStructureDialog.java index fd40a78eed..fed710cb23 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EditLogicalStructureDialog.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EditLogicalStructureDialog.java @@ -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; } } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java index c031102792..44f55951c8 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java @@ -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)) { @@ -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()))); } } @@ -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) { } } @@ -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)); } } } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugOptionsManager.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugOptionsManager.java index 1cd8603a5d..8038c7b306 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugOptionsManager.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugOptionsManager.java @@ -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() { diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersManager.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersManager.java index 6c9388263f..cca9553529 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersManager.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersManager.java @@ -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); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaLogicalStructuresPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaLogicalStructuresPreferencePage.java index 640ba1012d..e697396cab 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaLogicalStructuresPreferencePage.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaLogicalStructuresPreferencePage.java @@ -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(); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/NoLineNumberAttributesStatusHandler.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/NoLineNumberAttributesStatusHandler.java index 4b1ba63959..e83b0c4e01 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/NoLineNumberAttributesStatusHandler.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/NoLineNumberAttributesStatusHandler.java @@ -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); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/SuspendTimeoutStatusHandler.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/SuspendTimeoutStatusHandler.java index 58b5d1beb6..e3d9ca7b57 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/SuspendTimeoutStatusHandler.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/SuspendTimeoutStatusHandler.java @@ -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(); } }); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExternalJarAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExternalJarAction.java index 15d1d8279f..09540a8d95 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExternalJarAction.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExternalJarAction.java @@ -69,7 +69,7 @@ public void run() { list.add(JavaRuntime.newArchiveRuntimeClasspathEntry(path)); } else { - MessageDialog.openError(getShell(), ActionMessages.AddExternalJarAction_error_box_title, NLS.bind(ActionMessages.AddExternalJarAction_error_box_message, new String[] {path.makeAbsolute().toOSString()})); + MessageDialog.openError(getShell(), ActionMessages.AddExternalJarAction_error_box_title, NLS.bind(ActionMessages.AddExternalJarAction_error_box_message, path.makeAbsolute().toOSString())); } } if(list.size() > 0) { diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifierJob.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifierJob.java index f3ccdd9905..79a97e2785 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifierJob.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifierJob.java @@ -165,7 +165,7 @@ public IStatus manageLineBreakpoint(String typeName, int lineNumber) { if (breakpointExist) { if (differentLineNumber) { // There is already a breakpoint on the valid line. - report(NLS.bind(ActionMessages.BreakpointLocationVerifierJob_0, new String[]{Integer.toString(lineNumber)})); + report(NLS.bind(ActionMessages.BreakpointLocationVerifierJob_0, Integer.toString(lineNumber))); return new Status(IStatus.OK, JDIDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, ActionMessages.BreakpointLocationVerifierJob_not_valid_location, null); } // There is already a breakpoint on the valid line, but it's also the requested line. @@ -180,7 +180,7 @@ public IStatus manageLineBreakpoint(String typeName, int lineNumber) { if (breakpointExist) { // there is already a breakpoint on the valid line. DebugPlugin.getDefault().getBreakpointManager().removeBreakpoint(fBreakpoint, true); - report(NLS.bind(ActionMessages.BreakpointLocationVerifierJob_0, new String[]{Integer.toString(lineNumber)})); + report(NLS.bind(ActionMessages.BreakpointLocationVerifierJob_0, Integer.toString(lineNumber))); return new Status(IStatus.OK, JDIDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, ActionMessages.BreakpointLocationVerifierJob_not_valid_location, null); } replaceBreakpoint(lineNumber, typeName); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java index 8502e2aeec..bcc4768145 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java @@ -518,7 +518,7 @@ protected void reportError(String message) { IDataDisplay dataDisplay= getDirectDataDisplay(); if (dataDisplay != null) { if (message.length() != 0) { - dataDisplay.displayExpressionValue(NLS.bind(ActionMessages.EvaluateAction__evaluation_failed__Reason, new String[] {format(message)})); + dataDisplay.displayExpressionValue(NLS.bind(ActionMessages.EvaluateAction__evaluation_failed__Reason, format(message))); } else { dataDisplay.displayExpressionValue(ActionMessages.EvaluateAction__evaluation_failed__1); } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExpressionInputDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExpressionInputDialog.java index 9cfd02d2d3..92fe445604 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExpressionInputDialog.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExpressionInputDialog.java @@ -153,7 +153,7 @@ protected void populateInputArea(Composite parent) { JDIDebugUIPlugin.log(e); } - SWTFactory.createWrapLabel(fSourceViewerComposite, NLS.bind(ActionMessages.ExpressionInputDialog_0, new String[] {name}), 1, convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH)); + SWTFactory.createWrapLabel(fSourceViewerComposite, NLS.bind(ActionMessages.ExpressionInputDialog_0, name), 1, convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH)); fSourceViewer= new JDISourceViewer(fSourceViewerComposite, null, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL); fSourceViewer.setInput(fSourceViewerComposite); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InstanceFiltersAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InstanceFiltersAction.java index 03a79b2b1f..76ec2595db 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InstanceFiltersAction.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InstanceFiltersAction.java @@ -143,7 +143,7 @@ public void run(IAction action) { return; } - InstanceFilterDialog dialog = new InstanceFilterDialog(JDIDebugUIPlugin.getActiveWorkbenchShell(), breakpoints, modelPresentation, NLS.bind(ActionMessages.InstanceFiltersAction_1, new String[] {var.getName()})){ + InstanceFilterDialog dialog = new InstanceFilterDialog(JDIDebugUIPlugin.getActiveWorkbenchShell(), breakpoints, modelPresentation, NLS.bind(ActionMessages.InstanceFiltersAction_1, var.getName())){ @Override public void okPressed() { // check if breakpoints have already been restricted to other objects. @@ -162,7 +162,7 @@ public void okPressed() { } if (sameTarget) { MessageDialog messageDialog= new MessageDialog(JDIDebugUIPlugin.getActiveWorkbenchShell(), ActionMessages.InstanceFiltersAction_2, - null, NLS.bind(ActionMessages.InstanceFiltersAction_3, new String[] { modelPresentation.getText(breakpoint), var.getName()}), + null, NLS.bind(ActionMessages.InstanceFiltersAction_3, modelPresentation.getText(breakpoint), var.getName()), MessageDialog.QUESTION, new String[] { ActionMessages.InstanceFiltersAction_Yes_2, ActionMessages.InstanceFiltersAction_Cancel_3}, // 0); if (messageDialog.open() == Window.OK) { diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaPrimitiveValueEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaPrimitiveValueEditor.java index bb658661ab..43a14a08b2 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaPrimitiveValueEditor.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaPrimitiveValueEditor.java @@ -55,7 +55,7 @@ public boolean editVariable(IVariable variable, Shell shell) { try { String name= variable.getName(); String title= ActionMessages.JavaPrimitiveValueEditor_0; - String message= NLS.bind(ActionMessages.JavaPrimitiveValueEditor_1, new String[] {name}); + String message = NLS.bind(ActionMessages.JavaPrimitiveValueEditor_1, name); String initialValue= variable.getValue().getValueString(); PrimitiveValidator validator= new PrimitiveValidator(); InputDialog dialog= new InputDialog(shell, title, message, initialValue, validator){ @@ -185,7 +185,7 @@ public String isValid(String newText) { break; } if (type != null) { - return NLS.bind(ActionMessages.JavaPrimitiveValueEditor_4, new String[] { type }); + return NLS.bind(ActionMessages.JavaPrimitiveValueEditor_4, type); } return null; } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHandler.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHandler.java index 2c3a013b34..aee78eafb8 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHandler.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHandler.java @@ -289,7 +289,7 @@ public void run() { } catch (JavaModelException e) { methodName = getMethod().getElementName(); } - new MessageDialog(JDIDebugUIPlugin.getActiveWorkbenchShell(), ActionMessages.StepIntoSelectionHandler_1, null, NLS.bind(ActionMessages.StepIntoSelectionHandler_Execution_did_not_enter____0____before_the_current_method_returned__1, new String[]{methodName}), MessageDialog.INFORMATION, new String[] {ActionMessages.StepIntoSelectionHandler_2}, 0).open(); + new MessageDialog(JDIDebugUIPlugin.getActiveWorkbenchShell(), ActionMessages.StepIntoSelectionHandler_1, null, NLS.bind(ActionMessages.StepIntoSelectionHandler_Execution_did_not_enter____0____before_the_current_method_returned__1, methodName), MessageDialog.INFORMATION, new String[] {ActionMessages.StepIntoSelectionHandler_2}, 0).open(); } }; JDIDebugUIPlugin.getStandardDisplay().asyncExec(r); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/JavaBreakpointTypeAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/JavaBreakpointTypeAdapterFactory.java index e455386e3c..d455849339 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/JavaBreakpointTypeAdapterFactory.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/JavaBreakpointTypeAdapterFactory.java @@ -70,7 +70,7 @@ public T getAdapter(Object adaptableObject, Class adapterType) { if (stratum != null) { Object type = fStratumTypes.get(stratum); if (type == null) { - String label = NLS.bind(BreakpointMessages.JavaBreakpointTypeAdapterFactory_0, new String[]{stratum}); + String label = NLS.bind(BreakpointMessages.JavaBreakpointTypeAdapterFactory_0, stratum); if (stratum.equalsIgnoreCase("jsp")) { //$NON-NLS-1$ type = new BreakpointTypeCategory(label, getImageDescriptor(JavaDebugImages.IMG_OBJS_JSP_BRKPT_TYPE)); } else { diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/DefaultClasspathEntryDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/DefaultClasspathEntryDialog.java index 79dd72b2a9..cd1ece5479 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/DefaultClasspathEntryDialog.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/DefaultClasspathEntryDialog.java @@ -49,7 +49,7 @@ public class DefaultClasspathEntryDialog extends MessageDialog { public DefaultClasspathEntryDialog(Shell parentShell, IRuntimeClasspathEntry entry) { super(parentShell, ClasspathMessages.DefaultClasspathEntryDialog_0, null, - NLS.bind(ClasspathMessages.DefaultClasspathEntryDialog_1, new String[]{entry.getJavaProject().getElementName()}), + NLS.bind(ClasspathMessages.DefaultClasspathEntryDialog_1, entry.getJavaProject().getElementName()), MessageDialog.NONE, new String[]{ClasspathMessages.DefaultClasspathEntryDialog_2, ClasspathMessages.DefaultClasspathEntryDialog_3}, 0); fEntry = (DefaultProjectClasspathEntry) entry; } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceHyperlink.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceHyperlink.java index f7389a2bae..e87fb549e0 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceHyperlink.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceHyperlink.java @@ -208,8 +208,8 @@ public IStatus runInUIThread(IProgressMonitor monitor) { if (source == null) { if (status == null) { // did not find source - MessageDialog.openInformation(JDIDebugUIPlugin.getActiveWorkbenchShell(), ConsoleMessages.JavaStackTraceHyperlink_Information_1, NLS.bind(ConsoleMessages.JavaStackTraceHyperlink_Source_not_found_for__0__2, new String[] { - typeName })); + MessageDialog.openInformation(JDIDebugUIPlugin.getActiveWorkbenchShell(), ConsoleMessages.JavaStackTraceHyperlink_Information_1, NLS.bind(ConsoleMessages.JavaStackTraceHyperlink_Source_not_found_for__0__2, + typeName)); } else { JDIDebugUIPlugin.statusDialog(ConsoleMessages.JavaStackTraceHyperlink_3, status); } @@ -585,6 +585,7 @@ protected void processSearchResult(Object source, String typeName, int lineNumbe IRegion line = document.getLineInformation(lineNumber); textEditor.selectAndReveal(line.getOffset(), line.getLength()); } catch (BadLocationException e) { + MessageDialog.openInformation(JDIDebugUIPlugin.getActiveWorkbenchShell(), ConsoleMessages.JavaStackTraceHyperlink_0, NLS.bind("{0}{1}{2}", new String[] { //$NON-NLS-1$ (lineNumber + 1) + "", ConsoleMessages.JavaStackTraceHyperlink_1, typeName })); //$NON-NLS-1$ } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/JavaInspectExpression.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/JavaInspectExpression.java index bdd4fadd60..5dfa4dbab6 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/JavaInspectExpression.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/JavaInspectExpression.java @@ -192,7 +192,7 @@ public static String[] getErrorMessages(IEvaluationResult result) { Throwable cause= exception.getStatus().getException(); if (cause instanceof InvocationException) { String nestedMessage= ((InvocationException) cause).exception().referenceType().name(); - return new String[] { NLS.bind(DisplayMessages.JavaInspectExpression_0, new String[] {nestedMessage}) }; + return new String[] { NLS.bind(DisplayMessages.JavaInspectExpression_0, nestedMessage) }; } return new String[] { exception.getMessage() }; } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllInstancesActionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllInstancesActionDelegate.java index 2502182f86..1521763b62 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllInstancesActionDelegate.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllInstancesActionDelegate.java @@ -203,8 +203,7 @@ protected void displayInstaces(IAction action, JDIReferenceType rtype) { private void displayPopup(IAction action, JDIDebugTarget target, JDIReferenceType rtype, String name) { JDIAllInstancesValue aiv = new JDIAllInstancesValue(target, rtype); - InspectPopupDialog ipd = new InspectPopupDialog(getShell(), getAnchor(), PopupInspectAction.ACTION_DEFININITION_ID, new JavaInspectExpression(NLS.bind(Messages.AllInstancesActionDelegate_2, new String[] { - name }), aiv)); + InspectPopupDialog ipd = new InspectPopupDialog(getShell(), getAnchor(), PopupInspectAction.ACTION_DEFININITION_ID, new JavaInspectExpression(NLS.bind(Messages.AllInstancesActionDelegate_2, name), aiv)); ipd.open(); ipd.getTreeViewer().addDoubleClickListener(event -> handleDoubleClick(action, event)); } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllReferencesActionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllReferencesActionDelegate.java index 0c23e3a58e..64c8f8e505 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllReferencesActionDelegate.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/AllReferencesActionDelegate.java @@ -52,7 +52,7 @@ public void run(IAction action) { InspectPopupDialog ipd = new InspectPopupDialog(getShell(), getAnchor(getPart().getAdapter(IDebugView.class)), PopupInspectAction.ACTION_DEFININITION_ID, - new JavaInspectExpression(NLS.bind(Messages.AllReferencesActionDelegate_1,new String[]{var.getName()}),referenceList)); + new JavaInspectExpression(NLS.bind(Messages.AllReferencesActionDelegate_1, var.getName()), referenceList)); ipd.open(); ipd.getTreeViewer().addDoubleClickListener(doubleClick -> handleDoubleClick(action, doubleClick)); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/InstanceCountActionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/InstanceCountActionDelegate.java index 9a27660378..6f61f69c63 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/InstanceCountActionDelegate.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/heapwalking/InstanceCountActionDelegate.java @@ -58,11 +58,11 @@ protected void displayNoInstances(IAction action, IJavaDebugTarget target, Strin protected void displayNumInstances(String typeName, long instanceCount) { String message = null; if (instanceCount == 0L) { - message = NLS.bind(Messages.InstanceCountActionDelegate_0, new String[]{typeName}); + message = NLS.bind(Messages.InstanceCountActionDelegate_0, typeName); } else if (instanceCount == 1L) { - message = NLS.bind(Messages.InstanceCountActionDelegate_1, new String[]{typeName}); + message = NLS.bind(Messages.InstanceCountActionDelegate_1, typeName); } else { - message = NLS.bind(Messages.InstanceCountActionDelegate_2, new String[]{Long.toString(instanceCount), typeName}); + message = NLS.bind(Messages.InstanceCountActionDelegate_2, Long.toString(instanceCount), typeName); } MessageDialog.openInformation(getShell(), Messages.InstanceCountActionDelegate_3, message); } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/BuildJREDescriptor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/BuildJREDescriptor.java index bf0ed662cb..ffe7becd37 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/BuildJREDescriptor.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/BuildJREDescriptor.java @@ -30,7 +30,7 @@ public class BuildJREDescriptor extends JREDescriptor { @Override public String getDescription() { IVMInstall defaultVMInstall = JavaRuntime.getDefaultVMInstall(); - return defaultVMInstall != null ? NLS.bind(JREMessages.BuildJREDescriptor_0, new String[] { defaultVMInstall.getName() }) + return defaultVMInstall != null ? NLS.bind(JREMessages.BuildJREDescriptor_0, defaultVMInstall.getName()) : JREMessages.BuildJREDescriptor_1; } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/InstalledJREsBlock.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/InstalledJREsBlock.java index 4306581829..04ec5afac0 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/InstalledJREsBlock.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/InstalledJREsBlock.java @@ -253,7 +253,7 @@ public String getColumnText(Object element, int columnIndex) { switch(columnIndex) { case 0: if (JavaRuntime.isContributedVMInstall(vm.getId())) { - return NLS.bind(JREMessages.InstalledJREsBlock_19, new String[]{vm.getName()}); + return NLS.bind(JREMessages.InstalledJREsBlock_19, vm.getName()); } if(fVMList.getChecked(element)) { return NLS.bind(JREMessages.InstalledJREsBlock_7, vm.getName()); @@ -926,7 +926,7 @@ public void run(IProgressMonitor monitor) { if (locations.isEmpty()) { String messagePath = path.replace("&", "&&"); // @see bug 29855 //$NON-NLS-1$//$NON-NLS-2$ - MessageDialog.openInformation(getShell(), JREMessages.InstalledJREsBlock_12, NLS.bind(JREMessages.InstalledJREsBlock_13, new String[]{messagePath})); // + MessageDialog.openInformation(getShell(), JREMessages.InstalledJREsBlock_12, NLS.bind(JREMessages.InstalledJREsBlock_13, messagePath)); // } else { Iterator iter2 = types.iterator(); for(File location: locations) { @@ -1054,8 +1054,8 @@ protected void search(File directory, List found, List typ return; } File file = name == null ? directory : new File(directory, name); - monitor.subTask(NLS.bind(JREMessages.InstalledJREsBlock_14, new String[] { Integer.toString(found.size()), - file.toPath().normalize().toAbsolutePath().toString().replace("&", "&&") })); // @see bug 29855 //$NON-NLS-1$ //$NON-NLS-2$ + monitor.subTask(NLS.bind(JREMessages.InstalledJREsBlock_14, Integer.toString(found.size()), + file.toPath().normalize().toAbsolutePath().toString().replace("&", "&&") )); // @see bug 29855 //$NON-NLS-1$ //$NON-NLS-2$ IVMInstallType[] vmTypes = JavaRuntime.getVMInstallTypes(); if (file.isDirectory()) { if (ignore.add(file)) { diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsComboBlock.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsComboBlock.java index 4d70f94568..17e86dafbf 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsComboBlock.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsComboBlock.java @@ -473,9 +473,9 @@ protected void fillWithWorkspaceProfiles() { IPath path = JavaRuntime.newJREContainerPath(env); IVMInstall install = JavaRuntime.getVMInstall(path); if (install != null) { - names[i] = NLS.bind(JREMessages.JREsComboBlock_15, new String[]{env.getId(), install.getName()}); + names[i] = NLS.bind(JREMessages.JREsComboBlock_15, env.getId(), install.getName()); } else { - names[i] = NLS.bind(JREMessages.JREsComboBlock_16, new String[]{env.getId()}); + names[i] = NLS.bind(JREMessages.JREsComboBlock_16, env.getId()); } i++; } @@ -603,12 +603,12 @@ public void setPath(IPath containerPath) { if (environment == null) { fErrorPath = containerPath; selectEnvironment(environment); - setError(NLS.bind(JREMessages.JREsComboBlock_6, new String[]{envId})); + setError(NLS.bind(JREMessages.JREsComboBlock_6, envId)); } else { selectEnvironment(environment); IVMInstall[] installs = environment.getCompatibleVMs(); if (installs.length == 0) { - setError(NLS.bind(JREMessages.JREsComboBlock_7, new String[]{environment.getId()})); + setError(NLS.bind(JREMessages.JREsComboBlock_7, environment.getId())); } } } else { @@ -622,13 +622,13 @@ public void setPath(IPath containerPath) { } else { IVMInstallType installType = JavaRuntime.getVMInstallType(installTypeId); if (installType == null) { - setError(NLS.bind(JREMessages.JREsComboBlock_9, new String[]{installTypeId})); + setError(NLS.bind(JREMessages.JREsComboBlock_9, installTypeId)); } else { String installName = JavaRuntime.getVMInstallName(containerPath); if (installName == null) { - setError(NLS.bind(JREMessages.JREsComboBlock_10, new String[]{installType.getName()})); + setError(NLS.bind(JREMessages.JREsComboBlock_10, installType.getName())); } else { - setError(NLS.bind(JREMessages.JREsComboBlock_11, new String[]{installName, installType.getName()})); + setError(NLS.bind(JREMessages.JREsComboBlock_11, installName, installType.getName())); } } } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsEnvironmentLabelProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsEnvironmentLabelProvider.java index 47ebb69745..f24b249610 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsEnvironmentLabelProvider.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsEnvironmentLabelProvider.java @@ -69,7 +69,7 @@ public void dispose() { public String getText(Object element) { String label = super.getText(element); if (isStrictlyCompatible(element)) { - label = NLS.bind(JREMessages.JREsEnvironmentLabelProvider_0, new String[]{label, JREMessages.JREsEnvironmentLabelProvider_1}); + label = NLS.bind(JREMessages.JREsEnvironmentLabelProvider_0, label, JREMessages.JREsEnvironmentLabelProvider_1); } return label; } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsPreferencePage.java index 17698670a3..30fdef7ac1 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsPreferencePage.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsPreferencePage.java @@ -193,7 +193,7 @@ public boolean isValid() { private void validateComplianceAndJRE(IVMInstall vmInstall) { String compliance = getCurrentCompilerCompliance(); if (!supportsCurrentCompliance(vmInstall, compliance)) { - setMessage(NLS.bind(JREMessages.JREsPreferencePage_0, new String[] {compliance}), IMessageProvider.WARNING); + setMessage(NLS.bind(JREMessages.JREsPreferencePage_0, compliance), IMessageProvider.WARNING); fCompliance.setVisible(true); } else { @@ -210,7 +210,7 @@ private void validateComplianceAndJRE(IVMInstall vmInstall) { } } if (vmver != null && vmver.length() != 0 && JavaCore.compareJavaVersions(vmver, latest) > 0) { - setMessage(NLS.bind(JREMessages.JREsPreferencePage_9, new String[] { compliance }), IMessageProvider.WARNING); + setMessage(NLS.bind(JREMessages.JREsPreferencePage_9, compliance), IMessageProvider.WARNING); fCompliance.setVisible(true); } else { setMessage(null); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/StandardVMCommandTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/StandardVMCommandTab.java index f1401d491b..3d574a3710 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/StandardVMCommandTab.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/StandardVMCommandTab.java @@ -75,7 +75,7 @@ public void createControl(Composite parent) { gd = new GridData(GridData.BEGINNING); gd.horizontalSpan = 2; fDefaultButton.setLayoutData(gd); - fDefaultButton.setText(NLS.bind(JREMessages.AbstractJavaCommandTab_2, new String[]{getDefaultCommand()})); + fDefaultButton.setText(NLS.bind(JREMessages.AbstractJavaCommandTab_2, getDefaultCommand())); fDefaultButton.addSelectionListener(new SelectionAdapter() { @Override diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletLaunchConfigurationUtils.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletLaunchConfigurationUtils.java index c159e00d75..4e8dd55c7d 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletLaunchConfigurationUtils.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletLaunchConfigurationUtils.java @@ -82,7 +82,7 @@ public static IType getMainType(String mainTypeName, IJavaProject javaProject) t } catch (JavaModelException jme) { } if (mainType == null) { - abort(NLS.bind(LauncherMessages.appletlauncher_utils_error_main_type_does_not_exist, new String[] {mainTypeName, javaProject.getElementName()}), null, IJavaLaunchConfigurationConstants.ERR_UNSPECIFIED_MAIN_TYPE); + abort(NLS.bind(LauncherMessages.appletlauncher_utils_error_main_type_does_not_exist, mainTypeName, javaProject.getElementName()), null, IJavaLaunchConfigurationConstants.ERR_UNSPECIFIED_MAIN_TYPE); } return mainType; } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathEntryLabelProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathEntryLabelProvider.java index 11f7d700bd..ed48690158 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathEntryLabelProvider.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathEntryLabelProvider.java @@ -140,10 +140,10 @@ public String getText(Object element) { case IRuntimeClasspathEntry.ARCHIVE: IPath path = entry.getPath(); if (path == null) { - return NLS.bind(LauncherMessages.RuntimeClasspathEntryLabelProvider_Invalid_path, new String[]{"null"}); //$NON-NLS-1$ + return NLS.bind(LauncherMessages.RuntimeClasspathEntryLabelProvider_Invalid_path, "null"); //$NON-NLS-1$ } if (!path.isAbsolute() || !path.isValidPath(path.toString())) { - return NLS.bind(LauncherMessages.RuntimeClasspathEntryLabelProvider_Invalid_path, new String[]{path.toOSString()}); + return NLS.bind(LauncherMessages.RuntimeClasspathEntryLabelProvider_Invalid_path, path.toOSString()); } String[] segments = path.segments(); StringBuilder displayPath = new StringBuilder(); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SelectSystemLibraryQuickFix.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SelectSystemLibraryQuickFix.java index e2b9d96864..b6e76789c2 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SelectSystemLibraryQuickFix.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SelectSystemLibraryQuickFix.java @@ -109,7 +109,7 @@ public void run(IProgressMonitor monitor) throws InvocationTargetException { */ @Override public String getLabel() { - return NLS.bind(LauncherMessages.JREContainerResolution_Select_a_system_library_to_use_when_building__0__2, new String[]{fProject.getElementName()}); + return NLS.bind(LauncherMessages.JREContainerResolution_Select_a_system_library_to_use_when_building__0__2, fProject.getElementName()); } } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/JavaBreakpointPage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/JavaBreakpointPage.java index d7ac508119..7c00d864bf 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/JavaBreakpointPage.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/JavaBreakpointPage.java @@ -201,7 +201,7 @@ protected Control createContents(Composite parent) { @Override public void shellActivated(ShellEvent e) { Shell shell = (Shell)e.getSource(); - shell.setText(NLS.bind(PropertyPageMessages.JavaBreakpointPage_10, new String[]{getName(getBreakpoint())})); + shell.setText(NLS.bind(PropertyPageMessages.JavaBreakpointPage_10, getName(getBreakpoint()))); shell.removeShellListener(this); } @Override diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java index 5b73471469..b7c5cb32dd 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java @@ -386,7 +386,7 @@ public static ILaunchConfiguration getLaunchConfigurationTemplate(IFile file) th */ public static ILaunchConfiguration createLaunchConfigurationTemplate(IFile page) throws CoreException { ILaunchConfigurationType lcType = getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION); - String name = NLS.bind(SnippetMessages.getString("ScrapbookLauncher.17"), new String[]{page.getName()}); //$NON-NLS-1$ + String name = NLS.bind(SnippetMessages.getString("ScrapbookLauncher.17"), page.getName()); //$NON-NLS-1$ ILaunchConfigurationWorkingCopy wc = lcType.newInstance(null, name); wc.setAttribute(IDebugUIConstants.ATTR_PRIVATE, true); wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "org.eclipse.jdt.internal.debug.ui.snippeteditor.ScrapbookMain"); //$NON-NLS-1$ diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java index 59e33479b5..cbcb084a2e 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java @@ -99,8 +99,8 @@ protected IJavaSearchScope getTypeSearchScope() { */ @Override protected Control createDialogArea(Composite parent) { - setTitle(NLS.bind(SnippetMessages.getString("SelectImportsDialog.Manage_the_Java_Snippet_Editor_Imports_for___{0}__1"), new String[]{fEditor.getEditorInput().getName()})); //$NON-NLS-1$ - setMessage(NLS.bind(SnippetMessages.getString("SelectImportsDialog.add_remove_imports"), new String[]{fEditor.getEditorInput().getName()})); //$NON-NLS-1$ + setTitle(NLS.bind(SnippetMessages.getString("SelectImportsDialog.Manage_the_Java_Snippet_Editor_Imports_for___{0}__1"), fEditor.getEditorInput().getName())); //$NON-NLS-1$ + setMessage(NLS.bind(SnippetMessages.getString("SelectImportsDialog.add_remove_imports"), fEditor.getEditorInput().getName())); //$NON-NLS-1$ Composite outer = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_BOTH); GridLayout gl = (GridLayout) outer.getLayout(); gl.marginLeft = 7; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaThreadGroupLabelProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaThreadGroupLabelProvider.java index 2862a794ea..ab2c4f1ee2 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaThreadGroupLabelProvider.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/threadgroups/JavaThreadGroupLabelProvider.java @@ -35,7 +35,7 @@ public class JavaThreadGroupLabelProvider extends ElementLabelProvider { @Override protected String getLabel(TreePath elementPath, IPresentationContext presentationContext, String columnId) throws CoreException { IJavaThreadGroup group = (IJavaThreadGroup) elementPath.getLastSegment(); - return NLS.bind(ThreadGroupMessages.AsyncThreadGroupLabelAdapter_0, new String[]{group.getName()}); + return NLS.bind(ThreadGroupMessages.AsyncThreadGroupLabelAdapter_0, group.getName()); } /* (non-Javadoc) diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaExpressionContentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaExpressionContentProvider.java index c37c6c435d..4aedbcdf64 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaExpressionContentProvider.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaExpressionContentProvider.java @@ -47,7 +47,7 @@ protected Object[] getChildren(Object parent, int index, int length, IPresentati if (!(value instanceof JDIAllInstancesValue) && !(value instanceof JDIReferenceListValue)) { Object[] moreVariables = new Object[variables.length+1]; System.arraycopy(variables, 0, moreVariables, 1, variables.length); - moreVariables[0] = new JDIReferenceListVariable(NLS.bind(JDIDebugModelMessages.JDIReferenceListValue_6, new String[]{value.getReferenceTypeName() + " " + value.getValueString()}),(IJavaObject)value); //$NON-NLS-1$ + moreVariables[0] = new JDIReferenceListVariable(NLS.bind(JDIDebugModelMessages.JDIReferenceListValue_6, value.getReferenceTypeName() + " " + value.getValueString()),(IJavaObject)value); //$NON-NLS-1$ return getElements(moreVariables, index, length); } } diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableContentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableContentProvider.java index 0ff487ee75..bebbdab7fc 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableContentProvider.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableContentProvider.java @@ -50,7 +50,7 @@ protected Object[] getChildren(Object parent, int index, int length, IPresentati Object[] moreVariables = new Object[variables.length+1]; System.arraycopy(variables, 0, moreVariables, 1, variables.length); IValue value = ((IVariable)parent).getValue(); - moreVariables[0] = new JDIReferenceListVariable(NLS.bind(JDIDebugModelMessages.JDIReferenceListValue_6, new String[]{((IVariable)parent).getName()}),(IJavaObject)value); + moreVariables[0] = new JDIReferenceListVariable(NLS.bind(JDIDebugModelMessages.JDIReferenceListValue_6, ((IVariable) parent).getName()), (IJavaObject) value); return getElements(moreVariables, index, length); } return getElements(variables, index, length); diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Cast.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Cast.java index 1763c87be5..7e28d4da19 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Cast.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Cast.java @@ -111,7 +111,7 @@ public void execute() throws CoreException { JDIDebugPlugin.getUniqueIdentifier(), IStatus.OK, NLS.bind(InstructionsEvaluationMessages.Cast_No_class_object, - new String[] { typeName() }), + typeName()), null)); } IJavaPrimitiveValue resultValue = (IJavaPrimitiveValue) classObject @@ -125,9 +125,8 @@ public void execute() throws CoreException { JDIDebugPlugin.getUniqueIdentifier(), IStatus.OK, NLS.bind(InstructionsEvaluationMessages.Cast_ClassCastException__Cannot_cast__0__as__1___1, - new String[] { value.toString(), - typeName() }), null)); + typeName()), null)); } push(value); diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/InstanceOfOperator.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/InstanceOfOperator.java index 210e204cc7..6619c684da 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/InstanceOfOperator.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/InstanceOfOperator.java @@ -52,7 +52,7 @@ public void execute() throws CoreException { JDIDebugPlugin.getUniqueIdentifier(), IStatus.OK, NLS.bind(InstructionsEvaluationMessages.InstanceOfOperator_No_class_object, - new String[] { type.getName() }), + type.getName()), null)); } push(classObject.sendMessage(IS_INSTANCE, IS_INSTANCE_SIGNATURE, diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Instruction.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Instruction.java index 4c4fa485b3..a218eb40c3 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Instruction.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Instruction.java @@ -210,7 +210,7 @@ protected IJavaType getType(String qualifiedName) throws CoreException { JDIDebugPlugin.getUniqueIdentifier(), IStatus.OK, NLS.bind( InstructionsEvaluationMessages.Instruction_No_type, - new String[] { qualifiedName }), null)); + qualifiedName), null)); } return classReference.getInstanceType(); } @@ -266,7 +266,7 @@ protected IJavaType getPrimitiveType(String name) throws CoreException { JDIDebugPlugin.getUniqueIdentifier(), IStatus.OK, NLS.bind( InstructionsEvaluationMessages.Instruction_No_type, - new String[] { name }), null)); + name), null)); } protected IJavaArrayType getArrayType(String typeSignature, int dimension) @@ -286,7 +286,7 @@ protected IJavaArrayType getArrayType(String typeSignature, int dimension) JDIDebugPlugin.getUniqueIdentifier(), IStatus.OK, NLS.bind( InstructionsEvaluationMessages.Instruction_No_type, - new String[] { qualifiedName }), null)); + qualifiedName), null)); } IJavaType[] types = getVM().getJavaTypes(qualifiedName); checkTypes(types, qualifiedName); @@ -310,7 +310,7 @@ protected IJavaArrayType getArrayType(String typeSignature, int dimension) JDIDebugPlugin.getUniqueIdentifier(), IStatus.OK, NLS.bind( InstructionsEvaluationMessages.Instruction_No_type, - new String[] { qualifiedName }), null)); + qualifiedName), null)); } protected void checkTypes(IJavaType[] types, String qualifiedName) @@ -320,7 +320,7 @@ protected void checkTypes(IJavaType[] types, String qualifiedName) JDIDebugPlugin.getUniqueIdentifier(), IStatus.OK, NLS.bind( InstructionsEvaluationMessages.Instruction_No_type, - new String[] { qualifiedName }), null)); + qualifiedName), null)); } } diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/LocalVariableCreation.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/LocalVariableCreation.java index 533694bc04..8435305893 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/LocalVariableCreation.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/LocalVariableCreation.java @@ -113,6 +113,6 @@ public void execute() throws CoreException { @Override public String toString() { return NLS.bind(InstructionsEvaluationMessages.LocalVariableCreation_create_local_variable__0___1___1, - new String[] { fName, fTypeSignature }); + fName, fTypeSignature); } } diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushFieldVariable.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushFieldVariable.java index 48d41b2e3b..aeeb81814a 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushFieldVariable.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushFieldVariable.java @@ -90,8 +90,7 @@ public void execute() throws CoreException { JDIDebugPlugin.getUniqueIdentifier(), IStatus.OK, NLS.bind(InstructionsEvaluationMessages.PushFieldVariable_Cannot_find_the_field__0__for_the_object__1__1, - new String[] { fName, - receiver.toString() }), + fName, receiver.toString()), null)); // } push(field); @@ -100,6 +99,6 @@ public void execute() throws CoreException { @Override public String toString() { return NLS.bind(InstructionsEvaluationMessages.PushFieldVariable_push_field__0__2, - new String[] { fName }); + fName); } } diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushLocalVariable.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushLocalVariable.java index a41379d451..b3253f0c30 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushLocalVariable.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushLocalVariable.java @@ -84,7 +84,7 @@ public void execute() throws CoreException { JDIDebugPlugin.getUniqueIdentifier(), IStatus.OK, NLS.bind(InstructionsEvaluationMessages.PushLocalVariable_Cannot_find_the_variable____1, - new String[] { fName }), null)); + fName), null)); } /** @@ -100,6 +100,6 @@ protected String getName() { public String toString() { return NLS.bind( InstructionsEvaluationMessages.PushLocalVariable_push____0___2, - new String[] { getName() }); + getName()); } } diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushStaticFieldVariable.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushStaticFieldVariable.java index eda32e36ff..c23fd756f7 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushStaticFieldVariable.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushStaticFieldVariable.java @@ -52,7 +52,7 @@ public void execute() throws CoreException { } if (field == null) { String message = NLS.bind(InstructionsEvaluationMessages.PushStaticFieldVariable_Cannot_find_the_field__0__in__1__1, - new String[] { fFieldName, fQualifiedTypeName }); + fFieldName, fQualifiedTypeName); throw new CoreException(new Status(IStatus.ERROR, JDIDebugPlugin.getUniqueIdentifier(), IStatus.OK, message, null)); // couldn't find the field @@ -63,7 +63,7 @@ public void execute() throws CoreException { @Override public String toString() { return NLS.bind(InstructionsEvaluationMessages.PushStaticFieldVariable_push_static_field__0__2, - new String[] { fFieldName }); + fFieldName); } } diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/SendMessage.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/SendMessage.java index b0ed71d833..ddf3f04caa 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/SendMessage.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/SendMessage.java @@ -78,6 +78,6 @@ public void execute() throws CoreException { @Override public String toString() { return NLS.bind(InstructionsEvaluationMessages.SendMessage_send_message__0___1__2, - new String[] { fSelector, fSignature }); + fSelector, fSignature); } } diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/SendStaticMessage.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/SendStaticMessage.java index 2dc213e9df..8b24abf6f2 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/SendStaticMessage.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/SendStaticMessage.java @@ -79,6 +79,6 @@ public void execute() throws CoreException { @Override public String toString() { return NLS.bind(InstructionsEvaluationMessages.SendStaticMessage_send_static_message__0___1__2, - new String[] { fSelector, fSignature }); + fSelector, fSignature); } } diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java index 8b5ec4a245..741e637984 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java @@ -255,8 +255,7 @@ public void addFileInfo(int fileId, String fileName, FileInfo fileInfo = new FileInfo(fileId, fileName, absoluteFileName); if (fFileInfos.contains(fileInfo)) { throw new AbsentInformationException(NLS.bind( - JDIMessages.ReferenceTypeImpl_28, new String[] { - Integer.toString(fileId), fId })); + JDIMessages.ReferenceTypeImpl_28, Integer.toString(fileId), fId)); } fFileInfos.add(fileInfo); } @@ -288,7 +287,7 @@ public void addLineInfo(int inputStartLine, int lineFileId, if (fileInfo == null) { throw new AbsentInformationException(NLS.bind( JDIMessages.ReferenceTypeImpl_29, - new String[] { Integer.toString(lineFileId) })); + Integer.toString(lineFileId))); } // add the data to the different hash maps. for (int i = 0; i < repeatCount; i++, inputStartLine++) { diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/SourceDebugExtensionParser.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/SourceDebugExtensionParser.java index a88e81af2c..e1f7c1110d 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/SourceDebugExtensionParser.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/SourceDebugExtensionParser.java @@ -306,7 +306,7 @@ private void parseStratumSection(Lexer lexer) if (fDefinedStrata.contains(stratumId)) { throw new AbsentInformationException(NLS.bind( JDIMessages.SourceDebugExtensionParser_9, - new String[] { stratumId })); + stratumId)); } fCurrentStratum = new ReferenceTypeImpl.Stratum(stratumId); fFileSectionDefinedForCurrentStratum = false; @@ -318,7 +318,7 @@ private void parseStratumSection(Lexer lexer) if (fFileSectionDefinedForCurrentStratum) { throw new AbsentInformationException(NLS.bind( JDIMessages.SourceDebugExtensionParser_10, - new String[] { stratumId })); + stratumId)); } parseFileSection(lexer); fFileSectionDefinedForCurrentStratum = true; @@ -327,7 +327,7 @@ private void parseStratumSection(Lexer lexer) if (fLineSectionDefinedForCurrentStratum) { throw new AbsentInformationException(NLS.bind( JDIMessages.SourceDebugExtensionParser_11, - new String[] { stratumId })); + stratumId)); } parseLineSection(lexer); fLineSectionDefinedForCurrentStratum = true; @@ -341,19 +341,19 @@ private void parseStratumSection(Lexer lexer) default: throw new AbsentInformationException(NLS.bind( JDIMessages.SourceDebugExtensionParser_12, - new String[] { new String(lexer.lexem()) })); + new String(lexer.lexem()))); } lexemType = lexer.lexemType(); } if (!fFileSectionDefinedForCurrentStratum) { throw new AbsentInformationException(NLS.bind( JDIMessages.SourceDebugExtensionParser_13, - new String[] { stratumId })); + stratumId)); } if (!fLineSectionDefinedForCurrentStratum) { throw new AbsentInformationException(NLS.bind( JDIMessages.SourceDebugExtensionParser_14, - new String[] { stratumId })); + stratumId)); } fDefinedStrata.add(stratumId); fReferenceType.addStratum(fCurrentStratum); @@ -364,7 +364,7 @@ private void parseFileSection(Lexer lexer) if (lexer.nextLexem() != Lexer.CR) { throw new AbsentInformationException(NLS.bind( JDIMessages.SourceDebugExtensionParser_12, - new String[] { new String(lexer.lexem()) })); + new String(lexer.lexem()))); } lexer.nextLexem(); while (!isAsteriskLexem(lexer.lexemType())) { @@ -401,7 +401,7 @@ private void parseFileInfo(Lexer lexer) throws AbsentInformationException { fCurrentStratum.addFileInfo(fileId, fileName, getNonAsteriskString(lexer)); break; default: - throw new AbsentInformationException(NLS.bind(JDIMessages.SourceDebugExtensionParser_12, new String[] { new String(lexer.lexem()) })); + throw new AbsentInformationException(NLS.bind(JDIMessages.SourceDebugExtensionParser_12, new String(lexer.lexem()))); } } @@ -411,7 +411,7 @@ private void parseLineSection(Lexer lexer) if (lexer.nextLexem() != Lexer.CR) { throw new AbsentInformationException(NLS.bind( JDIMessages.SourceDebugExtensionParser_12, - new String[] { new String(lexer.lexem()) })); + new String(lexer.lexem()))); } lexer.nextLexem(); while (!isAsteriskLexem(lexer.lexemType())) { @@ -480,7 +480,7 @@ private void parseVendorSection(Lexer lexer) if (lexer.nextLexem() != Lexer.CR) { throw new AbsentInformationException(NLS.bind( JDIMessages.SourceDebugExtensionParser_12, - new String[] { new String(lexer.lexem()) })); + new String(lexer.lexem()))); } lexer.nextLexem(); while (!isAsteriskLexem(lexer.lexemType())) { @@ -494,7 +494,7 @@ private void parseFutureSection(Lexer lexer) if (lexer.nextLexem() != Lexer.CR) { throw new AbsentInformationException(NLS.bind( JDIMessages.SourceDebugExtensionParser_12, - new String[] { new String(lexer.lexem()) })); + new String(lexer.lexem()))); } lexer.nextLexem(); while (!isAsteriskLexem(lexer.lexemType())) { diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineImpl.java index cdecc3a9ba..a3bdd38fe4 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineImpl.java @@ -315,7 +315,7 @@ public final void removeKnownRefType(String signature) { public void checkHCRSupported() throws UnsupportedOperationException { if (!isHCRSupported()) { throw new UnsupportedOperationException( - NLS.bind(JDIMessages.VirtualMachineImpl_Target_VM__0__does_not_support_Hot_Code_Replacement_1, new String[] { name() })); + NLS.bind(JDIMessages.VirtualMachineImpl_Target_VM__0__does_not_support_Hot_Code_Replacement_1, name())); } } diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java index d383e72b08..66807b1583 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java @@ -128,13 +128,10 @@ public JdwpCommandPacket getCommand(int command, long timeToWait) String exMessage = getDisconnectException().getMessage(); if (exMessage == null) { message = NLS.bind(ConnectMessages.PacketReceiveManager_Got__0__from_Virtual_Machine_1, - new String[] { getDisconnectException() - .getClass().getName() }); + getDisconnectException().getClass().getName()); } else { message = NLS.bind(ConnectMessages.PacketReceiveManager_Got__0__from_Virtual_Machine___1__1, - new String[] { - getDisconnectException().getClass() - .getName(), exMessage }); + getDisconnectException().getClass().getName(), exMessage); } } throw new VMDisconnectedException(message); @@ -184,17 +181,19 @@ public JdwpReplyPacket getReply(int id, long timeToWait) { } } // Check for an IO Exception. - if (VMIsDisconnected()) + if (VMIsDisconnected()) { + throw new VMDisconnectedException( ConnectMessages.PacketReceiveManager_Got_IOException_from_Virtual_Machine_2); + + } // Check for a timeout. if (packet == null) { synchronized (fTimedOutPackets) { fTimedOutPackets.add(Integer.valueOf(id)); } throw new TimeoutException(NLS.bind( - ConnectMessages.PacketReceiveManager_0, new String[] { id - + "" })); //$NON-NLS-1$ + ConnectMessages.PacketReceiveManager_0, id + "")); //$NON-NLS-1$ } return packet; } @@ -211,12 +210,19 @@ public JdwpReplyPacket getReply(JdwpCommandPacket commandPacket) { */ private void waitForPacketAvailable(long timeToWait, Object lock) throws InterruptedException { - if (timeToWait == 0) + if (timeToWait == 0) { + return; - else if (timeToWait < 0) + + } else if (timeToWait < 0) { + lock.wait(); - else + + } else { + lock.wait(timeToWait); + + } } /** @@ -302,9 +308,14 @@ private void readAvailablePacket() throws IOException { byte[] bytes = getConnection().readPacket(); JdwpPacket packet = JdwpPacket.build(bytes); // Add packet to command or reply queue. - if (packet instanceof JdwpCommandPacket) + if (packet instanceof JdwpCommandPacket) { + addCommandPacket((JdwpCommandPacket) packet); - else + + } else { + addReplyPacket((JdwpReplyPacket) packet); + + } } } diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketSendManager.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketSendManager.java index 6bac2478b3..f693c59198 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketSendManager.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketSendManager.java @@ -80,13 +80,11 @@ public void sendPacket(JdwpPacket packet) { String exMessage = getDisconnectException().getMessage(); if (exMessage == null) { message = NLS.bind(ConnectMessages.PacketSendManager_Got__0__from_Virtual_Machine_1, - new String[] { getDisconnectException() - .getClass().getName() }); + getDisconnectException().getClass().getName()); } else { message = NLS.bind(ConnectMessages.PacketSendManager_Got__0__from_Virtual_Machine___1__1, - new String[] { getDisconnectException().getClass() - .getName(), exMessage }); + .getName(), exMessage); } } throw new VMDisconnectedException(message); diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketLaunchingConnectorImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketLaunchingConnectorImpl.java index 6a4081c0ca..7ba2795e97 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketLaunchingConnectorImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketLaunchingConnectorImpl.java @@ -226,7 +226,7 @@ public VirtualMachine launch(Map connection } catch (InterruptedIOException e) { proc.destroy(); String message = NLS.bind(ConnectMessages.SocketLaunchingConnectorImpl_VM_did_not_connect_within_given_time___0__ms_1, - new String[] { args.get("timeout").value() }); //$NON-NLS-1$ + args.get("timeout").value()); //$NON-NLS-1$ throw new VMStartException(message, proc); } diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketRawLaunchingConnectorImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketRawLaunchingConnectorImpl.java index 5d0334759f..244f79933b 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketRawLaunchingConnectorImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketRawLaunchingConnectorImpl.java @@ -153,7 +153,7 @@ public VirtualMachine launch(Map connection } catch (InterruptedIOException e) { proc.destroy(); String message = NLS.bind(ConnectMessages.SocketLaunchingConnectorImpl_VM_did_not_connect_within_given_time___0__ms_1, - new String[] { args.get("timeout").value() }); //$NON-NLS-1$ + args.get("timeout").value()); //$NON-NLS-1$ throw new VMStartException(message, proc); } diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestManagerImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestManagerImpl.java index 5b26ac94ca..9bde34ea54 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestManagerImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestManagerImpl.java @@ -421,7 +421,7 @@ public void deleteEventRequest(EventRequest req) { } else if(req instanceof MonitorWaitedRequestImpl) { deleteEventRequest(MONITOR_WAITED_TYPE, (MonitorWaitedRequestImpl)req); } else { - throw new InternalError(NLS.bind(RequestMessages.EventRequestManagerImpl_EventRequest_type_of__0__is_unknown_1, new String[]{req.toString()})); + throw new InternalError(NLS.bind(RequestMessages.EventRequestManagerImpl_EventRequest_type_of__0__is_unknown_1, req.toString())); } } diff --git a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF index 297102c3d3..7b3caee630 100644 --- a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.launching; singleton:=true -Bundle-Version: 3.23.300.qualifier +Bundle-Version: 3.23.400.qualifier Bundle-Activator: org.eclipse.jdt.internal.launching.LaunchingPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultProjectClasspathEntry.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultProjectClasspathEntry.java index d64bbfb3e2..4975dbb75c 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultProjectClasspathEntry.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultProjectClasspathEntry.java @@ -394,9 +394,9 @@ public boolean isComposite() { @Override public String getName() { if (isExportedEntriesOnly()) { - return NLS.bind(LaunchingMessages.DefaultProjectClasspathEntry_2, new String[] {getJavaProject().getElementName()}); + return NLS.bind(LaunchingMessages.DefaultProjectClasspathEntry_2, getJavaProject().getElementName()); } - return NLS.bind(LaunchingMessages.DefaultProjectClasspathEntry_4, new String[] {getJavaProject().getElementName()}); + return NLS.bind(LaunchingMessages.DefaultProjectClasspathEntry_4, getJavaProject().getElementName()); } /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java index 78c2410264..262ef66f30 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java @@ -168,7 +168,7 @@ private void validateCompliance(String eeId, final IJavaProject project, IVMInst } if (finalEnvironment != null) { if (!finalEnvironment.isStrictlyCompatible(vm)) { - String message = NLS.bind(LaunchingMessages.LaunchingPlugin_39, new String[] { id, eeId }); + String message = NLS.bind(LaunchingMessages.LaunchingPlugin_39, id, eeId); int sev = getSeverityLevel(JavaRuntime.PREF_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE, project.getProject()); if (sev != -1) { createProblemMarker(project, message, sev, JavaRuntime.JRE_COMPILER_COMPLIANCE_MARKER, LaunchingMessages.LaunchingPlugin_40); @@ -193,7 +193,7 @@ private void validateEnvironment(String id, final IJavaProject project, IVMInsta if (vm == null) { String message = NLS.bind( LaunchingMessages.LaunchingPlugin_38, - new String[]{environment.getId()}); + environment.getId()); createJREContainerProblem(project, message, IMarker.SEVERITY_ERROR); } else if (!environment.isStrictlyCompatible(vm)) { // warn that VM does not match EE @@ -216,11 +216,11 @@ private void validateEnvironment(String id, final IJavaProject project, IVMInsta } message = NLS.bind( LaunchingMessages.LaunchingPlugin_35, - new String[]{environment.getId()}); + environment.getId()); } else { message = NLS.bind( LaunchingMessages.LaunchingPlugin_36, - new String[]{environment.getId()}); + environment.getId()); } int sev = getSeverityLevel(JavaRuntime.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE, project.getProject()); if (sev != -1) { diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainer.java index 8439460421..6201543cb6 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainer.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainer.java @@ -404,7 +404,7 @@ public String getDescription() { } else { tag = environmentId; } - return NLS.bind(LaunchingMessages.JREContainer_JRE_System_Library_1, new String[]{tag}); + return NLS.bind(LaunchingMessages.JREContainer_JRE_System_Library_1, tag); } /** diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainerInitializer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainerInitializer.java index d60cee70ac..e21b34a6bf 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainerInitializer.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainerInitializer.java @@ -335,7 +335,7 @@ public IStatus getAttributeStatus(IPath containerPath, IJavaProject project, Str public void requestClasspathContainerUpdate(IPath containerPath, IJavaProject project, IClasspathContainer containerSuggestion) throws CoreException { IVMInstall vm = resolveVM(containerPath); if (vm == null) { - IStatus status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_VM_INSTALL_DOES_NOT_EXIST, NLS.bind(LaunchingMessages.JREContainerInitializer_JRE_referenced_by_classpath_container__0__does_not_exist__1, new String[]{containerPath.toString()}), null); + IStatus status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_VM_INSTALL_DOES_NOT_EXIST, NLS.bind(LaunchingMessages.JREContainerInitializer_JRE_referenced_by_classpath_container__0__does_not_exist__1, containerPath.toString()), null); throw new CoreException(status); } // update of the VM with new library locations @@ -383,11 +383,11 @@ public void requestClasspathContainerUpdate(IPath containerPath, IJavaProject pr } libs[i] = new LibraryLocation(path, srcPath, rootPath, javadocLocation, null, externalAnnotations); } else { - IStatus status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, NLS.bind(LaunchingMessages.JREContainerInitializer_Classpath_entry__0__does_not_refer_to_an_existing_library__2, new String[]{entry.getPath().toString()}), null); + IStatus status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, NLS.bind(LaunchingMessages.JREContainerInitializer_Classpath_entry__0__does_not_refer_to_an_existing_library__2, entry.getPath().toString()), null); throw new CoreException(status); } } else { - IStatus status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, NLS.bind(LaunchingMessages.JREContainerInitializer_Classpath_entry__0__does_not_refer_to_a_library__3, new String[]{entry.getPath().toString()}), null); + IStatus status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, NLS.bind(LaunchingMessages.JREContainerInitializer_Classpath_entry__0__does_not_refer_to_a_library__3, entry.getPath().toString()), null); throw new CoreException(status); } } @@ -407,7 +407,7 @@ public String getDescription(IPath containerPath, IJavaProject project) { tag = getVMName(containerPath); } if (tag != null) { - return NLS.bind(LaunchingMessages.JREContainer_JRE_System_Library_1, new String[]{tag}); + return NLS.bind(LaunchingMessages.JREContainer_JRE_System_Library_1, tag); } return LaunchingMessages.JREContainerInitializer_Default_System_Library_1; } diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaRemoteApplicationLaunchConfigurationDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaRemoteApplicationLaunchConfigurationDelegate.java index 9085c9877f..7bd1434ddb 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaRemoteApplicationLaunchConfigurationDelegate.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaRemoteApplicationLaunchConfigurationDelegate.java @@ -44,7 +44,7 @@ public void launch(ILaunchConfiguration configuration, String mode, ILaunch laun monitor = new NullProgressMonitor(); } - monitor.beginTask(NLS.bind(LaunchingMessages.JavaRemoteApplicationLaunchConfigurationDelegate_Attaching_to__0_____1, new String[]{configuration.getName()}), 3); + monitor.beginTask(NLS.bind(LaunchingMessages.JavaRemoteApplicationLaunchConfigurationDelegate_Attaching_to__0_____1, configuration.getName()), 3); // check for cancellation if (monitor.isCanceled()) { return; diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java index b2ceb2f2a8..913dbf4b66 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java @@ -671,7 +671,7 @@ public IRuntimeClasspathEntry2 newRuntimeClasspathEntry(String id) throws CoreEx if (config != null) { return (IRuntimeClasspathEntry2) config.createExecutableExtension("class"); //$NON-NLS-1$ } - abort(NLS.bind(LaunchingMessages.LaunchingPlugin_32, new String[]{id}), null); + abort(NLS.bind(LaunchingMessages.LaunchingPlugin_32, id), null); return null; } diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ProjectClasspathVariableResolver.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ProjectClasspathVariableResolver.java index 9d87cb176d..fae288cc3f 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ProjectClasspathVariableResolver.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ProjectClasspathVariableResolver.java @@ -75,7 +75,7 @@ public String resolveValue(IDynamicVariable variable, String argument) throws Co } return buffer.toString(); } - throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.ID_PLUGIN, NLS.bind(LaunchingMessages.ProjectClasspathVariableResolver_1, new String[]{argument}))); + throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.ID_PLUGIN, NLS.bind(LaunchingMessages.ProjectClasspathVariableResolver_1, argument))); } /** diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java index 640bdc08f9..71b2442f30 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java @@ -101,7 +101,7 @@ public RuntimeClasspathEntry(IClasspathEntry entry) { setType(VARIABLE); break; default: - throw new IllegalArgumentException(NLS.bind(LaunchingMessages.RuntimeClasspathEntry_Illegal_classpath_entry__0__1, new String[] {entry.toString()})); + throw new IllegalArgumentException(NLS.bind(LaunchingMessages.RuntimeClasspathEntry_Illegal_classpath_entry__0__1, entry.toString())); } setClasspathEntry(entry); initializeClasspathProperty(); @@ -128,8 +128,7 @@ public RuntimeClasspathEntry(IClasspathEntry entry, int classpathProperty) { setType(VARIABLE); break; default: - throw new IllegalArgumentException(NLS.bind(LaunchingMessages.RuntimeClasspathEntry_Illegal_classpath_entry__0__1, new String[] { - entry.toString() })); + throw new IllegalArgumentException(NLS.bind(LaunchingMessages.RuntimeClasspathEntry_Illegal_classpath_entry__0__1, entry.toString())); } setClasspathEntry(entry); setClasspathProperty(classpathProperty); diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketAttachConnector.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketAttachConnector.java index 17e41d5878..31f95ea2fe 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketAttachConnector.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketAttachConnector.java @@ -147,7 +147,7 @@ public void connect(Map arguments, IProgressMonitor monitor, ILa } catch (TimeoutException e) { abort(LaunchingMessages.SocketAttachConnector_0, e, IJavaLaunchConfigurationConstants.ERR_REMOTE_VM_CONNECTION_FAILED); } catch (UnknownHostException e) { - abort(NLS.bind(LaunchingMessages.SocketAttachConnector_Failed_to_connect_to_remote_VM_because_of_unknown_host____0___1, new String[]{host}), e, IJavaLaunchConfigurationConstants.ERR_REMOTE_VM_CONNECTION_FAILED); + abort(NLS.bind(LaunchingMessages.SocketAttachConnector_Failed_to_connect_to_remote_VM_because_of_unknown_host____0___1, host), e, IJavaLaunchConfigurationConstants.ERR_REMOTE_VM_CONNECTION_FAILED); } catch (ConnectException e) { abort(LaunchingMessages.SocketAttachConnector_Failed_to_connect_to_remote_VM_as_connection_was_refused_2, e, IJavaLaunchConfigurationConstants.ERR_REMOTE_VM_CONNECTION_FAILED); } catch (IOException e) { diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnector.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnector.java index 7d900f8185..07feed0ea3 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnector.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnector.java @@ -111,7 +111,7 @@ public void connect(Map arguments, IProgressMonitor monitor, ILa } try { - monitor.subTask(NLS.bind(LaunchingMessages.SocketListenConnector_3, new String[]{portNumberString})); + monitor.subTask(NLS.bind(LaunchingMessages.SocketListenConnector_3, portNumberString)); connector.startListening(acceptArguments); SocketListenConnectorProcess process = new SocketListenConnectorProcess(launch, portNumberString, connectionLimit); process.waitForConnection(connector, acceptArguments); diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnectorProcess.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnectorProcess.java index fed673b7d4..8e6dbfbf7d 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnectorProcess.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketListenConnectorProcess.java @@ -174,7 +174,7 @@ public int getExitValue() throws DebugException { */ @Override public String getLabel() { - return NLS.bind(LaunchingMessages.SocketListenConnectorProcess_1, new String[]{fPort}); + return NLS.bind(LaunchingMessages.SocketListenConnectorProcess_1, fPort); } /* (non-Javadoc) diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMRunner.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMRunner.java index 7007a5b8ce..53714a9853 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMRunner.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMRunner.java @@ -75,7 +75,7 @@ public StandardVMRunner(IVMInstall vmInstance) { */ protected String renderDebugTarget(String classToRun, int host) { String format= LaunchingMessages.StandardVMRunner__0__at_localhost__1__1; - return NLS.bind(format, new String[] { classToRun, String.valueOf(host) }); + return NLS.bind(format, classToRun, String.valueOf(host)); } /** @@ -91,7 +91,7 @@ public static String renderProcessLabel(Process p, String[] commandLine, String String processId = getProcessId(p); if (processId == null) { String format = LaunchingMessages.StandardVMRunner__0____1___2; - return NLS.bind(format, new String[] { commandLine[0], timestamp }); + return NLS.bind(format, commandLine[0], timestamp); } String format = LaunchingMessages.StandardVMRunner__0____1___2_3; return NLS.bind(format, new String[] { commandLine[0], timestamp, processId }); @@ -232,7 +232,7 @@ protected File getWorkingDir(VMRunnerConfiguration config) throws CoreException } File dir = new File(path); if (!dir.isDirectory()) { - abort(NLS.bind(LaunchingMessages.StandardVMRunner_Specified_working_directory_does_not_exist_or_is_not_a_directory___0__3, new String[] {path}), null, IJavaLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST); + abort(NLS.bind(LaunchingMessages.StandardVMRunner_Specified_working_directory_does_not_exist_or_is_not_a_directory___0__3, path), null, IJavaLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST); } return dir; } @@ -272,7 +272,7 @@ protected String constructProgramString(VMRunnerConfiguration config) throws Cor exe = StandardVMType.findJavaExecutable(fVMInstance.getInstallLocation()); } if (exe == null) { - abort(NLS.bind(LaunchingMessages.StandardVMRunner_Unable_to_locate_executable_for__0__1, new String[]{fVMInstance.getName()}), null, IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR); + abort(NLS.bind(LaunchingMessages.StandardVMRunner_Unable_to_locate_executable_for__0__1, fVMInstance.getName()), null, IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR); } else { return exe.getAbsolutePath(); } @@ -299,7 +299,7 @@ protected String constructProgramString(VMRunnerConfiguration config) throws Cor } // not found - abort(NLS.bind(LaunchingMessages.StandardVMRunner_Specified_executable__0__does_not_exist_for__1__4, new String[]{command, fVMInstance.getName()}), null, IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR); + abort(NLS.bind(LaunchingMessages.StandardVMRunner_Specified_executable__0__does_not_exist_for__1__4, command, fVMInstance.getName()), null, IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR); // NOTE: an exception will be thrown - null cannot be returned return null; } diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMDefinitionsContainer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMDefinitionsContainer.java index 439bed6b9a..8252766485 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMDefinitionsContainer.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMDefinitionsContainer.java @@ -506,13 +506,13 @@ private static void populateVMTypes(Element vmTypeElement, VMDefinitionsContaine IStatus status = null; if (name != null) { status = new Status(IStatus.INFO, LaunchingPlugin.ID_PLUGIN, - NLS.bind(LaunchingMessages.VMDefinitionsContainer_0, new String[]{name})); + NLS.bind(LaunchingMessages.VMDefinitionsContainer_0, name)); } else if (installPath != null) { status = new Status(IStatus.INFO, LaunchingPlugin.ID_PLUGIN, - NLS.bind(LaunchingMessages.VMDefinitionsContainer_0, new String[]{installPath})); + NLS.bind(LaunchingMessages.VMDefinitionsContainer_0, installPath)); } else { status = new Status(IStatus.INFO, LaunchingPlugin.ID_PLUGIN, - NLS.bind(LaunchingMessages.VMDefinitionsContainer_2, new String[]{id})); + NLS.bind(LaunchingMessages.VMDefinitionsContainer_2, id)); } container.addStatus(status); } @@ -537,15 +537,15 @@ private static void populateVMForType(IVMInstallType vmType, Element vmElement, if (name == null) { if (installPath == null) { container.addStatus(new Status(IStatus.ERROR, LaunchingPlugin.ID_PLUGIN, - NLS.bind(LaunchingMessages.VMDefinitionsContainer_3, new String[]{vmType.getName()}))); + NLS.bind(LaunchingMessages.VMDefinitionsContainer_3, vmType.getName()))); return; } - container.addStatus(new Status(IStatus.ERROR, LaunchingPlugin.ID_PLUGIN, NLS.bind(LaunchingMessages.VMDefinitionsContainer_4, new String[]{installPath}))); + container.addStatus(new Status(IStatus.ERROR, LaunchingPlugin.ID_PLUGIN, NLS.bind(LaunchingMessages.VMDefinitionsContainer_4, installPath))); return; } if (installPath == null) { container.addStatus(new Status(IStatus.ERROR, LaunchingPlugin.ID_PLUGIN, - NLS.bind(LaunchingMessages.VMDefinitionsContainer_5, new String[]{name}))); + NLS.bind(LaunchingMessages.VMDefinitionsContainer_5, name))); return; } @@ -598,7 +598,7 @@ private static void populateVMForType(IVMInstallType vmType, Element vmElement, vmStandin.setJavadocLocation(new URL(externalForm)); } catch (MalformedURLException e) { container.addStatus(new Status(IStatus.ERROR, LaunchingPlugin.ID_PLUGIN, - NLS.bind(LaunchingMessages.VMDefinitionsContainer_6, new String[]{name}), e)); + NLS.bind(LaunchingMessages.VMDefinitionsContainer_6, name), e)); } } } @@ -613,13 +613,13 @@ private static void populateVMForType(IVMInstallType vmType, Element vmElement, String name = vmElement.getAttribute("name"); //$NON-NLS-1$ if (name != null) { container.addStatus(new Status(IStatus.ERROR, LaunchingPlugin.ID_PLUGIN, - NLS.bind(LaunchingMessages.VMDefinitionsContainer_7, new String[]{name}))); + NLS.bind(LaunchingMessages.VMDefinitionsContainer_7, name))); } else if (installPath != null) { container.addStatus(new Status(IStatus.ERROR, LaunchingPlugin.ID_PLUGIN, - NLS.bind(LaunchingMessages.VMDefinitionsContainer_7, new String[]{installPath}))); + NLS.bind(LaunchingMessages.VMDefinitionsContainer_7, installPath))); } else { container.addStatus(new Status(IStatus.ERROR, LaunchingPlugin.ID_PLUGIN, - NLS.bind(LaunchingMessages.VMDefinitionsContainer_9, new String[]{vmType.getName()}))); + NLS.bind(LaunchingMessages.VMDefinitionsContainer_9, vmType.getName()))); } } } diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/EnvironmentsManager.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/EnvironmentsManager.java index 76139e1400..65c778c5cc 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/EnvironmentsManager.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/EnvironmentsManager.java @@ -280,8 +280,7 @@ private synchronized void initializeExtensions() { case ENVIRONMENT_ELEMENT: String id = element.getAttribute("id"); //$NON-NLS-1$ if (id == null) { - LaunchingPlugin.log(NLS.bind("Execution environment must specify \"id\" attribute. Contributed by {0}.", new String[] { //$NON-NLS-1$ - element.getContributor().getName() })); + LaunchingPlugin.log(NLS.bind("Execution environment must specify \"id\" attribute. Contributed by {0}.", element.getContributor().getName())); //$NON-NLS-1$ } else { IExecutionEnvironment env = new ExecutionEnvironment(element); fEnvironments.add(env); @@ -291,8 +290,8 @@ private synchronized void initializeExtensions() { case ANALYZER_ELEMENT: id = element.getAttribute("id"); //$NON-NLS-1$ if (id == null) { - LaunchingPlugin.log(NLS.bind("Execution environment analyzer must specify \"id\" attribute. Contributed by {0}", new String[] { //$NON-NLS-1$ - element.getContributor().getName() })); + + LaunchingPlugin.log(NLS.bind("Execution environment analyzer must specify \"id\" attribute. Contributed by {0}", element.getContributor().getName())); //$NON-NLS-1$ } else { fAnalyzers.put(id, new Analyzer(element)); } @@ -300,8 +299,7 @@ private synchronized void initializeExtensions() { case RULE_PARTICIPANT_ELEMENT: id = element.getAttribute("id"); //$NON-NLS-1$ if (id == null) { - LaunchingPlugin.log(NLS.bind("Execution environment rule participant must specify \"id\" attribute. Contributed by {0}", new String[] { //$NON-NLS-1$ - element.getContributor().getName() })); + LaunchingPlugin.log(NLS.bind("Execution environment rule participant must specify \"id\" attribute. Contributed by {0}", element.getContributor().getName())); //$NON-NLS-1$ } else { // use a linked hash set to avoid duplicate rule participants fRuleParticipants.add(new AccessRuleParticipant(element)); diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironment.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironment.java index 94002ed676..32b36b6610 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironment.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironment.java @@ -235,7 +235,7 @@ public IVMInstall getDefaultVM() { public void setDefaultVM(IVMInstall vm) { init(); if (vm != null && !fCompatibleVMs.contains(vm)) { - throw new IllegalArgumentException(NLS.bind(EnvironmentMessages.EnvironmentsManager_0, new String[]{getId()})); + throw new IllegalArgumentException(NLS.bind(EnvironmentMessages.EnvironmentsManager_0, getId())); } if (vm != null && vm.equals(fDefault)) { return; diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentVariableResolver.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentVariableResolver.java index 541b5be320..beb41f7900 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentVariableResolver.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentVariableResolver.java @@ -42,12 +42,12 @@ public String resolveValue(IDynamicVariable variable, String argument) throws Co IExecutionEnvironmentsManager manager = JavaRuntime.getExecutionEnvironmentsManager(); IExecutionEnvironment env = manager.getEnvironment(argument); if (env == null) { - throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.ID_PLUGIN, NLS.bind(EnvironmentMessages.ExecutionEnvironmentVariableResolver_1, new String[]{argument}))); + throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.ID_PLUGIN, NLS.bind(EnvironmentMessages.ExecutionEnvironmentVariableResolver_1, argument))); } IPath path = JavaRuntime.newJREContainerPath(env); IVMInstall jre = JavaRuntime.getVMInstall(path); if (jre == null) { - throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.ID_PLUGIN, NLS.bind(EnvironmentMessages.ExecutionEnvironmentVariableResolver_2, new String[]{argument}))); + throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.ID_PLUGIN, NLS.bind(EnvironmentMessages.ExecutionEnvironmentVariableResolver_2, argument))); } return jre.getInstallLocation().getAbsolutePath(); } diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractJavaLaunchConfigurationDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractJavaLaunchConfigurationDelegate.java index 5a2dacd0bb..ee1799f780 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractJavaLaunchConfigurationDelegate.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractJavaLaunchConfigurationDelegate.java @@ -210,15 +210,14 @@ public IVMInstall verifyVMInstall(ILaunchConfiguration configuration) File location = vm.getInstallLocation(); if (location == null) { abort( - NLS.bind(LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_JRE_home_directory_not_specified_for__0__5, new String[]{vm.getName()}), + NLS.bind(LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_JRE_home_directory_not_specified_for__0__5, vm.getName()), null, IJavaLaunchConfigurationConstants.ERR_VM_INSTALL_DOES_NOT_EXIST); } if (!location.exists()) { abort( NLS.bind(LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_JRE_home_directory_for__0__does_not_exist___1__6, - new String[]{vm.getName(), - location.getAbsolutePath()}), + vm.getName(), location.getAbsolutePath()), null, IJavaLaunchConfigurationConstants.ERR_VM_INSTALL_DOES_NOT_EXIST); } @@ -802,7 +801,7 @@ public File verifyWorkingDirectory(ILaunchConfiguration configuration) abort( NLS.bind( LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_Working_directory_does_not_exist___0__12, - new String[]{dir.toString()}), + dir.toString()), null, IJavaLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST); } @@ -824,7 +823,7 @@ public File verifyWorkingDirectory(ILaunchConfiguration configuration) abort( NLS.bind( LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_Working_directory_does_not_exist___0__12, - new String[]{path.toString()}), + path.toString()), null, IJavaLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST); } else { @@ -836,7 +835,7 @@ public File verifyWorkingDirectory(ILaunchConfiguration configuration) abort( NLS.bind( LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_Working_directory_does_not_exist___0__12, - new String[]{path.toString()}), + path.toString()), null, IJavaLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST); } @@ -1052,7 +1051,7 @@ public IVMRunner getVMRunner(ILaunchConfiguration configuration, String mode) th IVMInstall vm = verifyVMInstall(configuration); IVMRunner runner = vm.getVMRunner(mode); if (runner == null) { - abort(NLS.bind(LaunchingMessages.JavaLocalApplicationLaunchConfigurationDelegate_0, new String[]{vm.getName(), mode}), null, IJavaLaunchConfigurationConstants.ERR_VM_RUNNER_DOES_NOT_EXIST); + abort(NLS.bind(LaunchingMessages.JavaLocalApplicationLaunchConfigurationDelegate_0, vm.getName(), mode), null, IJavaLaunchConfigurationConstants.ERR_VM_RUNNER_DOES_NOT_EXIST); } return runner; } diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaLaunchDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaLaunchDelegate.java index b71b3711c2..1e43e5cf76 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaLaunchDelegate.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaLaunchDelegate.java @@ -65,7 +65,7 @@ public String showCommandLine(ILaunchConfiguration configuration, String mode, I @SuppressWarnings("deprecation") private VMRunnerConfiguration getVMRunnerConfiguration(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { - monitor.beginTask(NLS.bind("{0}...", new String[]{configuration.getName()}), 3); //$NON-NLS-1$ + monitor.beginTask(NLS.bind("{0}...", configuration.getName()), 3); //$NON-NLS-1$ // check for cancellation if (monitor.isCanceled()) { return null; diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java index 1b4b07c141..9d919ce668 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java @@ -1179,7 +1179,7 @@ public static IRuntimeClasspathProvider getClasspathProvider(ILaunchConfiguratio } else { provider = getClasspathProviders().get(providerId); if (provider == null) { - abort(NLS.bind(LaunchingMessages.JavaRuntime_26, new String[]{providerId}), null); + abort(NLS.bind(LaunchingMessages.JavaRuntime_26, providerId), null); } } return provider; @@ -1201,7 +1201,7 @@ public static IRuntimeClasspathProvider getSourceLookupPathProvider(ILaunchConfi } else { provider = getClasspathProviders().get(providerId); if (provider == null) { - abort(NLS.bind(LaunchingMessages.JavaRuntime_27, new String[]{providerId}), null); + abort(NLS.bind(LaunchingMessages.JavaRuntime_27, providerId), null); } } return provider; @@ -1252,7 +1252,7 @@ public static IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClas if (isOptional(entry.getClasspathEntry())) { return new IRuntimeClasspathEntry[] {}; } - abort(NLS.bind(LaunchingMessages.JavaRuntime_Classpath_references_non_existant_project___0__3, new String[]{entry.getPath().lastSegment()}), null); + abort(NLS.bind(LaunchingMessages.JavaRuntime_Classpath_references_non_existant_project___0__3, entry.getPath().lastSegment()), null); } break; case IRuntimeClasspathEntry.VARIABLE: @@ -1283,7 +1283,7 @@ public static IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClas if (isOptional(entry.getClasspathEntry())) { return new IRuntimeClasspathEntry[] {}; } - abort(NLS.bind(LaunchingMessages.JavaRuntime_Classpath_references_non_existant_archive___0__4, new String[] { entry.getPath().toString() }), null); + abort(NLS.bind(LaunchingMessages.JavaRuntime_Classpath_references_non_existant_archive___0__4, entry.getPath().toString()), null); case IRuntimeClasspathEntry.OTHER: resolver = getContributedResolver(((IRuntimeClasspathEntry2)entry).getTypeId()); return resolver.resolveRuntimeClasspathEntry(entry, configuration); @@ -1566,7 +1566,7 @@ private static IRuntimeClasspathEntry[] computeDefaultContainerEntries(IRuntimeC } IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), project); if (container == null) { - abort(NLS.bind(LaunchingMessages.JavaRuntime_Could_not_resolve_classpath_container___0__1, new String[]{entry.getPath().toString()}), null); + abort(NLS.bind(LaunchingMessages.JavaRuntime_Could_not_resolve_classpath_container___0__1, entry.getPath().toString()), null); // execution will not reach here - exception will be thrown return null; } @@ -1742,10 +1742,10 @@ public static IJavaProject getJavaProject(ILaunchConfiguration configuration) th } IJavaProject javaProject = getJavaModel().getJavaProject(projectName); if (javaProject != null && javaProject.getProject().exists() && !javaProject.getProject().isOpen()) { - abort(NLS.bind(LaunchingMessages.JavaRuntime_28, new String[] {configuration.getName(), projectName}), IJavaLaunchConfigurationConstants.ERR_PROJECT_CLOSED, null); + abort(NLS.bind(LaunchingMessages.JavaRuntime_28, configuration.getName(), projectName), IJavaLaunchConfigurationConstants.ERR_PROJECT_CLOSED, null); } if ((javaProject == null) || !javaProject.exists()) { - abort(NLS.bind(LaunchingMessages.JavaRuntime_Launch_configuration__0__references_non_existing_project__1___1, new String[] {configuration.getName(), projectName}), IJavaLaunchConfigurationConstants.ERR_NOT_A_JAVA_PROJECT, null); + abort(NLS.bind(LaunchingMessages.JavaRuntime_Launch_configuration__0__references_non_existing_project__1___1, configuration.getName(), projectName), IJavaLaunchConfigurationConstants.ERR_NOT_A_JAVA_PROJECT, null); } return javaProject; } @@ -1823,7 +1823,7 @@ private static IVMInstall resolveVM(String type, String name, ILaunchConfigurati IVMInstallType vt = getVMInstallType(type); if (vt == null) { // error type does not exist - abort(NLS.bind(LaunchingMessages.JavaRuntime_Specified_VM_install_type_does_not_exist___0__2, new String[] {type}), null); + abort(NLS.bind(LaunchingMessages.JavaRuntime_Specified_VM_install_type_does_not_exist___0__2, type), null); } IVMInstall vm = null; // look for a name @@ -1836,7 +1836,7 @@ private static IVMInstall resolveVM(String type, String name, ILaunchConfigurati vm = vt.findVMInstallByName(name); if (vm == null) { // error - install not found - abort(NLS.bind(LaunchingMessages.JavaRuntime_Specified_VM_install_not_found__type__0___name__1__2, new String[] {vt.getName(), name}), null); + abort(NLS.bind(LaunchingMessages.JavaRuntime_Specified_VM_install_not_found__type__0___name__1__2, vt.getName(), name), null); } else { return vm; } @@ -1995,12 +1995,12 @@ private static void addVMExtensions(VMDefinitionsContainer vmDefs) { String vmType = element.getAttribute("vmInstallType"); //$NON-NLS-1$ if (vmType == null) { abort(NLS.bind("Missing required vmInstallType attribute for vmInstall contributed by {0}", //$NON-NLS-1$ - new String[]{element.getContributor().getName()}), null); + element.getContributor().getName()), null); } String id = element.getAttribute("id"); //$NON-NLS-1$ if (id == null) { abort(NLS.bind("Missing required id attribute for vmInstall contributed by {0}", //$NON-NLS-1$ - new String[]{element.getContributor().getName()}), null); + element.getContributor().getName()), null); } IVMInstallType installType = getVMInstallType(vmType); if (installType == null) { @@ -2013,12 +2013,12 @@ private static void addVMExtensions(VMDefinitionsContainer vmDefs) { String name = element.getAttribute("name"); //$NON-NLS-1$ if (name == null) { abort(NLS.bind("vmInstall {0} contributed by {1} missing required attribute name", //$NON-NLS-1$ - new String[]{id, element.getContributor().getName()}), null); + id, element.getContributor().getName()), null); } String home = element.getAttribute("home"); //$NON-NLS-1$ if (home == null) { abort(NLS.bind("vmInstall {0} contributed by {1} missing required attribute home", //$NON-NLS-1$ - new String[]{id, element.getContributor().getName()}), null); + id, element.getContributor().getName()), null); } String javadoc = element.getAttribute("javadocURL"); //$NON-NLS-1$ String vmArgs = element.getAttribute("vmArgs"); //$NON-NLS-1$ @@ -2049,7 +2049,7 @@ private static void addVMExtensions(VMDefinitionsContainer vmDefs) { standin.setJavadocLocation(new URL(javadoc)); } catch (MalformedURLException e) { abort(NLS.bind("Illegal javadocURL attribute for vmInstall {0} contributed by {1}", //$NON-NLS-1$ - new String[]{id, element.getContributor().getName()}), e); + id, element.getContributor().getName()), e); } } // allow default arguments to be specified by VM install type if no explicit arguments @@ -2071,7 +2071,7 @@ private static void addVMExtensions(VMDefinitionsContainer vmDefs) { String libPathStr = library.getAttribute("path"); //$NON-NLS-1$ if (libPathStr == null) { abort(NLS.bind("library for vmInstall {0} contributed by {1} missing required attribute libPath", //$NON-NLS-1$ - new String[]{id, element.getContributor().getName()}), null); + id, element.getContributor().getName()), null); } String sourcePathStr = library.getAttribute("sourcePath"); //$NON-NLS-1$ String packageRootStr = library.getAttribute("packageRootPath"); //$NON-NLS-1$ @@ -2107,7 +2107,7 @@ private static void addVMExtensions(VMDefinitionsContainer vmDefs) { fgContributedVMs.add(id); } else { abort(NLS.bind("Illegal element {0} in vmInstalls extension contributed by {1}", //$NON-NLS-1$ - new String[]{element.getName(), element.getContributor().getName()}), null); + element.getName(), element.getContributor().getName()), null); } } catch (CoreException e) { LaunchingPlugin.log(e); diff --git a/org.eclipse.jdt.launching/pom.xml b/org.eclipse.jdt.launching/pom.xml index b78febeace..cb36bdcc3b 100644 --- a/org.eclipse.jdt.launching/pom.xml +++ b/org.eclipse.jdt.launching/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jdt org.eclipse.jdt.launching - 3.23.300-SNAPSHOT + 3.23.400-SNAPSHOT eclipse-plugin