diff options
7 files changed, 30 insertions, 7 deletions
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointChange.java index 748460210..b6df423e7 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointChange.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2014 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -17,6 +17,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.debug.core.model.IBreakpoint; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.jdt.core.IClassFile; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IImportContainer; @@ -56,6 +57,7 @@ public abstract class BreakpointChange extends Change { private int fSuspendPolicy; private IJavaThread[] fThreadFilters; private boolean fEnabled; + private String fWorkingSetNames; /** * Constructor @@ -70,6 +72,7 @@ public abstract class BreakpointChange extends Change { fSuspendPolicy = breakpoint.getSuspendPolicy(); fThreadFilters = breakpoint.getThreadFilters(); fEnabled = breakpoint.isEnabled(); + fWorkingSetNames = (String) breakpoint.getMarker().getAttribute(IInternalDebugUIConstants.WORKING_SET_NAME); } /** @@ -281,4 +284,12 @@ public abstract class BreakpointChange extends Change { protected String getBreakpointLabel(IBreakpoint breakpoint) { return JDIDebugUIPlugin.getDefault().getModelPresentation().getText(breakpoint); } + + /** + * Returns the original breakpoint working set names + * @return the original breakpoint working set names + */ + protected String getOriginalWorkingSets() { + return fWorkingSetNames; + } } 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 5783df046..429597fe1 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2014 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,6 +16,7 @@ import java.util.Map; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.jdt.core.ISourceRange; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.debug.core.IJavaClassPrepareBreakpoint; @@ -54,6 +55,7 @@ public class ClassPrepareBreakpointTypeChange extends ClassPrepareBreakpointChan IResource resource = BreakpointUtils.getBreakpointResource(fDestType); Map<String, Object> map = new HashMap<String, Object>(); BreakpointUtils.addJavaBreakpointAttributes(map, fDestType); + map.put(IInternalDebugUIConstants.WORKING_SET_NAME, getOriginalWorkingSets());// creating breakpoint in the original working set // TODO - start/end should be adjusted, but can access new CU from model yet ISourceRange range = fDestType.getNameRange(); IJavaClassPrepareBreakpoint breakpoint = JDIDebugModel.createClassPrepareBreakpoint( 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 9ea58141d..1f87dede0 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2014 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,6 +16,7 @@ import java.util.Map; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.debug.core.IJavaLineBreakpoint; import org.eclipse.jdt.debug.core.JDIDebugModel; @@ -57,6 +58,7 @@ public class LineBreakpointTypeChange extends LineBreakpointChange { IResource resource = BreakpointUtils.getBreakpointResource(fDestType); Map<String, Object> map = new HashMap<String, Object>(); BreakpointUtils.addJavaBreakpointAttributes(map, fDestType); + map.put(IInternalDebugUIConstants.WORKING_SET_NAME, getOriginalWorkingSets());// creating breakpoint in the original working set IJavaLineBreakpoint breakpoint = JDIDebugModel.createLineBreakpoint( resource, fDestType.getFullyQualifiedName(), 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 8cd943857..2dc5154f8 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2014 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,6 +16,7 @@ import java.util.Map; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.debug.core.IJavaMethodBreakpoint; import org.eclipse.jdt.debug.core.JDIDebugModel; @@ -53,6 +54,7 @@ public class MethodBreakpointMethodChange extends MethodBreakpointChange { BreakpointUtils.addJavaBreakpointAttributes(map, fDestMethod); IResource resource = BreakpointUtils.getBreakpointResource(fDestMethod); int range[] = getNewLineNumberAndRange(fDestMethod); + map.put(IInternalDebugUIConstants.WORKING_SET_NAME, getOriginalWorkingSets()); IJavaMethodBreakpoint breakpoint = JDIDebugModel.createMethodBreakpoint( resource, fDestMethod.getDeclaringType().getFullyQualifiedName(), 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 8b48e12d1..ee4ccf572 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2014 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,6 +16,7 @@ import java.util.Map; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.Signature; @@ -73,6 +74,7 @@ public class MethodBreakpointTypeChange extends MethodBreakpointChange { } Map<String, Object> map = new HashMap<String, Object>(); BreakpointUtils.addJavaBreakpointAttributes(map, destMethod); + map.put(IInternalDebugUIConstants.WORKING_SET_NAME, getOriginalWorkingSets());// creating breakpoint in the original working set IResource resource = BreakpointUtils.getBreakpointResource(destMethod); int[] range = getNewLineNumberAndRange(destMethod); IJavaMethodBreakpoint breakpoint = JDIDebugModel.createMethodBreakpoint( 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 2079ad352..f69d09428 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2014 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,6 +16,7 @@ import java.util.Map; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.jdt.core.IField; import org.eclipse.jdt.debug.core.IJavaWatchpoint; import org.eclipse.jdt.debug.core.JDIDebugModel; @@ -51,6 +52,7 @@ public class WatchpointFieldChange extends WatchpointChange { @Override public Change perform(IProgressMonitor pm) throws CoreException { Map<String, Object> map = new HashMap<String, Object>(); + map.put(IInternalDebugUIConstants.WORKING_SET_NAME, getOriginalWorkingSets());// creating breakpoint in the original working set BreakpointUtils.addJavaBreakpointAttributes(map, fDestField); IResource resource = BreakpointUtils.getBreakpointResource(fDestField); int[] range = getNewLineNumberAndRange(fDestField); diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointTypeRenameChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointTypeRenameChange.java index 812931006..729a4dc0b 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointTypeRenameChange.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/WatchpointTypeRenameChange.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2014 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,6 +16,7 @@ import java.util.Map; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.jdt.core.IField; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IType; @@ -62,6 +63,7 @@ public class WatchpointTypeRenameChange extends WatchpointTypeChange { Map<String, Object> map = new HashMap<String, Object>(); BreakpointUtils.addJavaBreakpointAttributes(map, destinationField); + map.put(IInternalDebugUIConstants.WORKING_SET_NAME, getOriginalWorkingSets()); // creating breakpoint in the original working set IResource resource = BreakpointUtils.getBreakpointResource(destinationField); int[] range = getNewLineNumberAndRange(destinationField); IJavaWatchpoint breakpoint = JDIDebugModel.createWatchpoint( |