Replaced deprecated methods.

5 files changed, 25 insertions, 7 deletions

diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index 394a3751052..1b7d7fefe9b 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,4 +1,11 @@
 2005-04-21 Mikhail Khodjaiants

+	Replaced deprecated methods.

+	* CBreakpointPropertiesAction.java

+	* CBreakpointPropertiesRulerAction.java

+	* ModulesPropertiesActionDelegate.java

+	* SignalPropertiesActionDelegate.java

+

+2005-04-21 Mikhail Khodjaiants

 	Bug 80175: Replace the CDT source lookup by the source lookup provided by Eclipse platform.

 	* CDebugModelPresentation.java

 	* ICDebugHelpContextIds.java

diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesAction.java
index 112fcd3d920..4e11bc0299a 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesAction.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesAction.java
@@ -11,7 +11,6 @@
 package org.eclipse.cdt.debug.internal.ui.actions;
 
 import org.eclipse.cdt.debug.core.model.ICBreakpoint;
-import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -49,7 +48,7 @@ public class CBreakpointPropertiesAction implements IObjectActionDelegate {
 	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
 	 */
 	public void run( IAction action ) {
-		PropertyDialogAction propertyAction = new PropertyDialogAction( CDebugUIPlugin.getActiveWorkbenchShell(), new ISelectionProvider() {
+		PropertyDialogAction propertyAction = new PropertyDialogAction( getActivePart().getSite(), new ISelectionProvider() {
 
 			public void addSelectionChangedListener( ISelectionChangedListener listener ) {
 			}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesRulerAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesRulerAction.java
index 93c6fbfc382..30b42684a2a 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesRulerAction.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesRulerAction.java
@@ -43,7 +43,7 @@ public class CBreakpointPropertiesRulerAction extends AbstractBreakpointRulerAct
 	 */
 	public void run() {
 		if ( getBreakpoint() != null ) {
-			PropertyDialogAction action = new PropertyDialogAction( getTargetPart().getSite().getShell(), new ISelectionProvider() {
+			PropertyDialogAction action = new PropertyDialogAction( getTargetPart().getSite(), new ISelectionProvider() {
 
 				public void addSelectionChangedListener( ISelectionChangedListener listener ) {
 				}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ModulesPropertiesActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ModulesPropertiesActionDelegate.java
index 86e0b57aa9b..ce35a8c8415 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ModulesPropertiesActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ModulesPropertiesActionDelegate.java
@@ -11,7 +11,6 @@
 package org.eclipse.cdt.debug.internal.ui.actions; 
 
 import org.eclipse.cdt.debug.core.model.ICModule;
-import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -30,6 +29,8 @@ public class ModulesPropertiesActionDelegate extends ActionDelegate implements I
 
 	private ICModule fModule;
 
+	private IWorkbenchPart fTargetPart;
+
 	/** 
 	 * Constructor for ModulesPropertiesActionDelegate. 
 	 */
@@ -49,13 +50,14 @@ public class ModulesPropertiesActionDelegate extends ActionDelegate implements I
 	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
 	 */
 	public void setActivePart( IAction action, IWorkbenchPart targetPart ) {
+		fTargetPart = targetPart;
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
 	 */
 	public void run( IAction action ) {
-		PropertyDialogAction propertyAction = new PropertyDialogAction( CDebugUIPlugin.getActiveWorkbenchShell(), new ISelectionProvider() {
+		PropertyDialogAction propertyAction = new PropertyDialogAction( getActivePart().getSite(), new ISelectionProvider() {
 
 			public void addSelectionChangedListener( ISelectionChangedListener listener ) {
 			}
@@ -88,4 +90,8 @@ public class ModulesPropertiesActionDelegate extends ActionDelegate implements I
 		action.setEnabled( false );
 		setModule( null );
 	}
+
+	protected IWorkbenchPart getActivePart() {
+		return fTargetPart;
+	}
 }
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/SignalPropertiesActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/SignalPropertiesActionDelegate.java
index 8a37b5be49e..9daa004ff75 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/SignalPropertiesActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/SignalPropertiesActionDelegate.java
@@ -11,7 +11,6 @@
 package org.eclipse.cdt.debug.internal.ui.actions;
 
 import org.eclipse.cdt.debug.core.model.ICSignal;
-import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -30,6 +29,8 @@ public class SignalPropertiesActionDelegate extends ActionDelegate implements IO
 
 	private ICSignal fSignal;
 
+	private IWorkbenchPart fTargetPart;
+
 	/**
 	 * Constructor for SignalPropertiesActionDelegate.
 	 * 
@@ -43,6 +44,7 @@ public class SignalPropertiesActionDelegate extends ActionDelegate implements IO
 	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
 	 */
 	public void setActivePart( IAction action, IWorkbenchPart targetPart ) {
+		fTargetPart = targetPart;
 	}
 
 	/* (non-Javadoc)
@@ -73,7 +75,7 @@ public class SignalPropertiesActionDelegate extends ActionDelegate implements IO
 	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
 	 */
 	public void run( IAction action ) {
-		PropertyDialogAction propertyAction = new PropertyDialogAction( CDebugUIPlugin.getActiveWorkbenchShell(), new ISelectionProvider() {
+		PropertyDialogAction propertyAction = new PropertyDialogAction( getActivePart().getSite(), new ISelectionProvider() {
 
 			public void addSelectionChangedListener( ISelectionChangedListener listener ) {
 			}
@@ -90,4 +92,8 @@ public class SignalPropertiesActionDelegate extends ActionDelegate implements IO
 		} );
 		propertyAction.run();
 	}
+
+	protected IWorkbenchPart getActivePart() {
+		return fTargetPart;
+	}
 }