Bug 173187
Line Breakpoint changes unclear during refactoring
(other breakpoint types as well)
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 f65f958..279450f 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
@@ -23,6 +23,8 @@
import org.eclipse.jdt.internal.debug.ui.BreakpointUtils;
import org.eclipse.ltk.core.refactoring.Change;
+import com.ibm.icu.text.MessageFormat;
+
/**
* @since 3.2
*
@@ -40,7 +42,13 @@
* @see org.eclipse.ltk.core.refactoring.Change#getName()
*/
public String getName() {
- return RefactoringMessages.ClassPrepareBreakpointTypeChange_0;
+ try {
+ IJavaClassPrepareBreakpoint bp = (IJavaClassPrepareBreakpoint) getOriginalBreakpoint();
+ return MessageFormat.format(RefactoringMessages.ClassPrepareBreakpointTypeChange_1, new String[] {bp.getTypeName()});
+ }
+ catch (CoreException ce) {
+ return RefactoringMessages.ClassPrepareBreakpointTypeChange_0;
+ }
}
/* (non-Javadoc)
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 d7fe000..1ac7e77 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
@@ -22,6 +22,8 @@
import org.eclipse.jdt.internal.debug.ui.BreakpointUtils;
import org.eclipse.ltk.core.refactoring.Change;
+import com.ibm.icu.text.MessageFormat;
+
/**
* @since 3.2
*
@@ -38,7 +40,13 @@
* @see org.eclipse.ltk.core.refactoring.Change#getName()
*/
public String getName() {
- return RefactoringMessages.MethodBreakpointMethodChange_0;
+ try {
+ IJavaMethodBreakpoint bp = (IJavaMethodBreakpoint) getOriginalBreakpoint();
+ return MessageFormat.format(RefactoringMessages.MethodBreakpointMethodChange_1, new String[] {bp.getTypeName(), bp.getMethodSignature()});
+ }
+ catch(CoreException ce) {
+ return RefactoringMessages.MethodBreakpointMethodChange_0;
+ }
}
/* (non-Javadoc)
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/RefactoringMessages.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/RefactoringMessages.java
index a4a855c..1f7d45e 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/RefactoringMessages.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/RefactoringMessages.java
@@ -15,6 +15,8 @@
public class RefactoringMessages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.jdt.internal.debug.core.refactoring.RefactoringMessages";//$NON-NLS-1$
+ public static String ClassPrepareBreakpointTypeChange_1;
+
public static String LaunchConfigurationProjectMainTypeChange_0;
public static String LaunchConfigurationProjectMainTypeChange_1;
public static String LaunchConfigurationProjectMainTypeChange_2;
@@ -26,8 +28,12 @@
public static String LineBreakpointTypeChange_1;
+ public static String MethodBreakpointMethodChange_1;
+
public static String MethodBreakpointTypeChange_1;
+ public static String WatchpointFieldChange_1;
+
static {
// load message values from bundle file
NLS.initializeMessages(BUNDLE_NAME, RefactoringMessages.class);
@@ -45,4 +51,6 @@
public static String DeleteBreakpointChange_0;
public static String LaunchConfigurationParticipant_0;
+
+ public static String WatchpointTypeChange_1;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/RefactoringMessages.properties b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/RefactoringMessages.properties
index fb7f8ed..b05e41f 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/RefactoringMessages.properties
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/RefactoringMessages.properties
@@ -20,15 +20,19 @@
LaunchConfigurationParticipant_0=Launch configuration participant
WatchpointTypeChange_0=Watchpoint type change
+WatchpointTypeChange_1=Watchpoint {0} [name: {1}] type change
WatchpointFieldChange_0=Watchpoint field change
+WatchpointFieldChange_1=Watchpoint field [{0}] change
LineBreakpointTypeChange_0=Line breakpoint {0} [line: {1}] type change
LineBreakpointTypeChange_1=Line breakpoint type change
ExceptionBreakpointTypeChange_0=Exception breakpoint type change
ClassPrepareBreakpointTypeChange_0=Class load breakpoint type change
+ClassPrepareBreakpointTypeChange_1=Class load breakpoint [{0}] type change
BreakpointRenameParticipant_0=Breakpoint participant
BreakpointRenameParticipant_1=Breakpoint changes
MethodBreakpointTypeChange_0=Method breakpoint {0} [name: {1}] type change
MethodBreakpointTypeChange_1=Method breakpoint type change
MethodBreakpointMethodChange_0=Method breakpoint method change
+MethodBreakpointMethodChange_1=Method breakpoint {0} [signature: {1}] method change
DeleteBreakpointChange_0=Delete breakpoint
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 2ce8ae5..76e37dd 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
@@ -22,6 +22,8 @@
import org.eclipse.jdt.internal.debug.ui.BreakpointUtils;
import org.eclipse.ltk.core.refactoring.Change;
+import com.ibm.icu.text.MessageFormat;
+
/**
* @since 3.2
*
@@ -39,7 +41,13 @@
* @see org.eclipse.ltk.core.refactoring.Change#getName()
*/
public String getName() {
- return RefactoringMessages.WatchpointFieldChange_0;
+ try {
+ IJavaWatchpoint wp = (IJavaWatchpoint) getOriginalBreakpoint();
+ return MessageFormat.format(RefactoringMessages.WatchpointFieldChange_1, new String[] {wp.getFieldName()});
+ }
+ catch(CoreException ce) {
+ return RefactoringMessages.WatchpointFieldChange_0;
+ }
}
/* (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 5bdf5ba..ec94521 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
@@ -23,6 +23,8 @@
import org.eclipse.jdt.internal.debug.ui.BreakpointUtils;
import org.eclipse.ltk.core.refactoring.Change;
+import com.ibm.icu.text.MessageFormat;
+
/**
* @since 3.2
*
@@ -41,7 +43,13 @@
* @see org.eclipse.ltk.core.refactoring.Change#getName()
*/
public String getName() {
- return RefactoringMessages.WatchpointTypeChange_0;
+ try {
+ IJavaWatchpoint wp = (IJavaWatchpoint) getOriginalBreakpoint();
+ return MessageFormat.format(RefactoringMessages.WatchpointTypeChange_1, new String[] {wp.getTypeName(), wp.getFieldName()});
+ }
+ catch (CoreException ce) {
+ return RefactoringMessages.WatchpointTypeChange_0;
+ }
}
/* (non-Javadoc)
