From 1f321a1dc716ff9e4bdf8dfb3b9fb28d58293074 Mon Sep 17 00:00:00 2001 From: cperkonig Date: Tue, 22 Jun 2004 07:19:38 +0000 Subject: [PATCH] reduce warnings due to core.runtime deprecations --- net.sourceforge.phpeclipse.debug.core/plugin.xml | 1 - .../phpdt/internal/debug/core/PHPDBGProxy.java | 137 ++++++++++---------- .../internal/debug/core/PHPDebugCorePlugin.java | 23 ++-- .../debug/core/breakpoints/PHPBreakpoint.java | 8 +- net.sourceforge.phpeclipse.debug.ui/plugin.xml | 2 - .../phpdt/debug/ui/PHPDebugUiImages.java | 11 ++- .../phpdt/internal/debug/ui/PHPDebugUiPlugin.java | 5 +- .../debug/ui/actions/ToggleBreakpointAdapter.java | 25 ---- net.sourceforge.phpeclipse.launching/plugin.xml | 9 +- .../launching/PHPLaunchConfigurationDelegate.java | 10 +- .../internal/launching/PHPLaunchingPlugin.java | 6 +- 11 files changed, 98 insertions(+), 139 deletions(-) diff --git a/net.sourceforge.phpeclipse.debug.core/plugin.xml b/net.sourceforge.phpeclipse.debug.core/plugin.xml index 3319866..576b674 100644 --- a/net.sourceforge.phpeclipse.debug.core/plugin.xml +++ b/net.sourceforge.phpeclipse.debug.core/plugin.xml @@ -13,7 +13,6 @@ - diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGProxy.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGProxy.java index 5c1f627..ad51716 100644 --- a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGProxy.java +++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGProxy.java @@ -138,7 +138,7 @@ public class PHPDBGProxy { int bpNo= 0; try { PHPLineBreakpoint phpLBP; - if(breakpoint.getModelIdentifier() == PHPDebugCorePlugin.getDefault().getDescriptor().getUniqueIdentifier()) { + if(breakpoint.getModelIdentifier() == PHPDebugCorePlugin.getUniqueIdentifier()) { IPath filename; phpLBP= (PHPLineBreakpoint)breakpoint; // bpNo= DBGInt.addBreakpoint(phpLBP.getMarker().getResource().getLocation().toOSString(), phpLBP.getLineNumber()); @@ -162,7 +162,7 @@ public class PHPDBGProxy { if (DBGInt == null) return; try { PHPLineBreakpoint phpLBP; - if(breakpoint.getModelIdentifier() == PHPDebugCorePlugin.getDefault().getDescriptor().getUniqueIdentifier()) { + if(breakpoint.getModelIdentifier() == PHPDebugCorePlugin.getUniqueIdentifier()) { phpLBP= (PHPLineBreakpoint)breakpoint; IPath filename; if (remote) @@ -345,16 +345,16 @@ public class PHPDBGProxy { while (!shouldStop) { newconnect=true; - try { - newSocket = server.accept(); + try { + newSocket = server.accept(); //System.out.println("Accepted! : " + socket.toString()); - } catch (SocketTimeoutException e) { + } catch (SocketTimeoutException e) { // no one wants to connect newconnect=false; - } catch (IOException e) { - PHPDebugCorePlugin.log(e); - return; - } + } catch (IOException e) { + PHPDebugCorePlugin.log(e); + return; + } if (newconnect) { @@ -362,84 +362,81 @@ public class PHPDBGProxy { server.setSoTimeout(1); newDBGInt= new PHPDBGInterface(getReader(newSocket), newSocket.getOutputStream(), thisProxy); newDBGInt.waitResponse(1000); - newDBGInt.flushAllPackets(); + newDBGInt.flushAllPackets(); // Check version and session ID - if ((DBGInt==null) || (DBGInt.getSID()==newDBGInt.getSID())) - { - DBGInt=newDBGInt; + if ((DBGInt==null) || (DBGInt.getSID()==newDBGInt.getSID())) + { + DBGInt=newDBGInt; try { closeSocket(); } catch (IOException e) { PHPDebugCorePlugin.log(e); shouldStop=true; } - socket=newSocket; + socket=newSocket; setBreakPoints(); DBGInt.continueExecution(); - } else - { + } else + { newDBGInt.continueExecution(); - newSocket.close(); - } + newSocket.close(); + } } - if(DBGInt.waitResponse(interval)) - { + if(DBGInt.waitResponse(interval)) + { - DBGInt.flushAllPackets(); - - if (DBGInt.BPUnderHit != 0) { - StackList = DBGInt.getStackList(); - if (StackList.length > 0) { - for (i = 0; i < StackList.length; i++) { - StackList[i].setThread(PHPMainThread); - if (DBGInt.getModByNo(StackList[i].getModNo()).equals("")) { - DBGInt.getSourceTree(); - } - StackList[i].setFile( - DBGInt.getModByNo(StackList[i].getModNo())); - } - PHPMainThread.setStackFrames(StackList); - } - // Fire debug event - PHPMainThread.suspend(); - - synchronized (this) { - wait(); - } - } - } - if (remote) { - if (PHPMainThread.isTerminated()) - { - shouldStop=true; - break; - } - } else { - if (PHPMainThread.isTerminated() || getDebugTarget().getProcess().isTerminated()) - { + DBGInt.flushAllPackets(); + + if (DBGInt.BPUnderHit != 0) { + StackList = DBGInt.getStackList(); + if (StackList.length > 0) { + for (i = 0; i < StackList.length; i++) { + StackList[i].setThread(PHPMainThread); + if (DBGInt.getModByNo(StackList[i].getModNo()).equals("")) { + DBGInt.getSourceTree(); + } + StackList[i].setFile( + DBGInt.getModByNo(StackList[i].getModNo())); + } + PHPMainThread.setStackFrames(StackList); + } + // Fire debug event + PHPMainThread.suspend(); + + synchronized (this) { + wait(); + } + } + } + if (remote) { + if (PHPMainThread.isTerminated()) { + shouldStop=true; + break; + } + } else { + if (PHPMainThread.isTerminated() || getDebugTarget().getProcess().isTerminated()) { shouldStop=true; break; - } - } + } + } + } + } + catch (Exception ex) { + PHPDebugCorePlugin.log(ex); + System.out.println(ex); + } + finally { + try { + getDebugTarget().terminate(); + closeSocket(); + closeServerSocket(); + } catch (IOException e) { + PHPDebugCorePlugin.log(e); + return; } - } - catch (Exception ex) { - PHPDebugCorePlugin.log(ex); - System.out.println(ex); - } - finally { - try { - getDebugTarget().terminate(); - closeSocket(); - closeServerSocket(); - } - catch (IOException e) { - PHPDebugCorePlugin.log(e); - return; - } //System.out.println("Socket loop finished."); - } + } } } } diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDebugCorePlugin.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDebugCorePlugin.java index 0e6f79f..137b708 100644 --- a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDebugCorePlugin.java +++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDebugCorePlugin.java @@ -2,11 +2,10 @@ package net.sourceforge.phpdt.internal.debug.core; import net.sourceforge.phpeclipse.PHPeclipsePlugin; import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.runtime.IPluginDescriptor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.*; +//import org.eclipse.core.runtime.*; import org.osgi.framework.BundleContext; /** @@ -20,8 +19,8 @@ public class PHPDebugCorePlugin extends Plugin { /** * The constructor. */ - public PHPDebugCorePlugin(IPluginDescriptor descriptor) { - super(descriptor); + public PHPDebugCorePlugin() { + super(); plugin = this; } @@ -55,23 +54,18 @@ public class PHPDebugCorePlugin extends Plugin { /** * Convenience method which returns the unique identifier of this plugin. */ -// public static String getUniqueIdentifier() { -// if (getDefault() == null) { -// // If the default instance is not yet initialized, -// // return a static identifier. This identifier must -// // match the plugin id defined in plugin.xml -// return PLUGIN_ID; -// } -// return getDefault().getDescriptor().getUniqueIdentifier(); -// } + public static String getUniqueIdentifier() { + return PLUGIN_ID; + } /** * @see Plugin#shutdown() */ - public void shutdown() throws CoreException { +/* public void shutdown() throws CoreException { plugin = null; super.shutdown(); } +*/ /** * This method is called upon plug-in activation */ @@ -83,6 +77,7 @@ public class PHPDebugCorePlugin extends Plugin { * This method is called when the plug-in is stopped */ public void stop(BundleContext context) throws Exception { + plugin=null; super.stop(context); } } diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/breakpoints/PHPBreakpoint.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/breakpoints/PHPBreakpoint.java index 55be0de..6d021af 100644 --- a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/breakpoints/PHPBreakpoint.java +++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/breakpoints/PHPBreakpoint.java @@ -174,13 +174,7 @@ public abstract class PHPBreakpoint extends Breakpoint implements IBreakpoint { * @see IBreakpoint#getModelIdentifier() */ public String getModelIdentifier() { - if (PHPDebugCorePlugin.getDefault() == null) { - // If the default instance is not yet initialized, - // return a static identifier. This identifier must - // match the plugin id defined in plugin.xml - return "net.sourceforge.phpeclipse.debug.core"; //$NON-NLS-1$ - } - return PHPDebugCorePlugin.getDefault().getDescriptor().getUniqueIdentifier(); + return PHPDebugCorePlugin.getUniqueIdentifier(); } public void setDBGBpNo(int bpNo) { diff --git a/net.sourceforge.phpeclipse.debug.ui/plugin.xml b/net.sourceforge.phpeclipse.debug.ui/plugin.xml index 87202ca..0b5548b 100644 --- a/net.sourceforge.phpeclipse.debug.ui/plugin.xml +++ b/net.sourceforge.phpeclipse.debug.ui/plugin.xml @@ -13,9 +13,7 @@ - - diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/debug/ui/PHPDebugUiImages.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/debug/ui/PHPDebugUiImages.java index e447ff7..77a48a9 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/debug/ui/PHPDebugUiImages.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/debug/ui/PHPDebugUiImages.java @@ -3,12 +3,14 @@ package net.sourceforge.phpdt.debug.ui; import java.net.MalformedURLException; import java.net.URL; -import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin; +// import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin; +//import org.eclipse.jdt.internal.ui.JavaPlugin; import org.eclipse.jface.action.IAction; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.swt.graphics.Image; +import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin; public class PHPDebugUiImages { @@ -16,6 +18,11 @@ public class PHPDebugUiImages { protected static final int NAME_PREFIX_LENGTH = NAME_PREFIX.length(); protected static URL iconBaseURL; + + static { + iconBaseURL= PHPDebugUiPlugin.getDefault().getBundle().getEntry("/icons/"); //$NON-NLS-1$ + } +/* static { String pathSuffix = "icons/"; try { @@ -24,7 +31,7 @@ public class PHPDebugUiImages { PHPDebugUiPlugin.log(e); } } - +*/ protected static final ImageRegistry IMAGE_REGISTRY = new ImageRegistry(); protected static final String CTOOL_PREFIX = "ctool16"; diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java index 79f91cb..7d66455 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java @@ -3,7 +3,6 @@ package net.sourceforge.phpdt.internal.debug.ui; import net.sourceforge.phpeclipse.PHPeclipsePlugin; import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.runtime.IPluginDescriptor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.ErrorDialog; @@ -18,8 +17,8 @@ public class PHPDebugUiPlugin extends AbstractUIPlugin { public static final String PLUGIN_ID = "net.sourceforge.phpeclipse.debug.ui"; //$NON-NLS-1$ protected static PHPDebugUiPlugin plugin; - public PHPDebugUiPlugin(IPluginDescriptor descriptor) { - super(descriptor); + public PHPDebugUiPlugin() { + super(); plugin = this; } diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java index 45c59bc..d50a217 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java @@ -11,55 +11,30 @@ package net.sourceforge.phpdt.internal.debug.ui.actions; import java.util.ArrayList; -import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Map; import net.sourceforge.phpdt.core.Flags; import net.sourceforge.phpdt.core.ICompilationUnit; -import net.sourceforge.phpdt.core.IField; import net.sourceforge.phpdt.core.IJavaElement; -import net.sourceforge.phpdt.core.IJavaProject; -import net.sourceforge.phpdt.core.IMember; import net.sourceforge.phpdt.core.IMethod; -import net.sourceforge.phpdt.core.ISourceRange; import net.sourceforge.phpdt.core.IType; -import net.sourceforge.phpdt.core.JavaCore; import net.sourceforge.phpdt.core.JavaModelException; import net.sourceforge.phpdt.core.Signature; -import net.sourceforge.phpdt.core.dom.CompilationUnit; -import net.sourceforge.phpdt.core.search.IJavaSearchConstants; -import net.sourceforge.phpdt.core.search.ITypeNameRequestor; import net.sourceforge.phpdt.debug.core.PHPDebugModel; import net.sourceforge.phpdt.internal.debug.core.breakpoints.PHPLineBreakpoint; import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin; import net.sourceforge.phpdt.internal.ui.util.ExceptionHandler; -import net.sourceforge.phpdt.ui.IWorkingCopyManager; -import net.sourceforge.phpdt.ui.JavaUI; - -import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.DebugPlugin; -import org.eclipse.debug.core.IBreakpointManager; -import org.eclipse.debug.core.ILaunch; -import org.eclipse.debug.core.ILaunchConfiguration; -import org.eclipse.debug.core.model.IBreakpoint; import org.eclipse.debug.internal.ui.actions.ActionMessages; import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget; -import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IFileEditorInput; diff --git a/net.sourceforge.phpeclipse.launching/plugin.xml b/net.sourceforge.phpeclipse.launching/plugin.xml index 175ef86..03c5dd5 100644 --- a/net.sourceforge.phpeclipse.launching/plugin.xml +++ b/net.sourceforge.phpeclipse.launching/plugin.xml @@ -10,20 +10,15 @@ + - - - - - - + - diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchConfigurationDelegate.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchConfigurationDelegate.java index 55e9eaf..cfa568e 100644 --- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchConfigurationDelegate.java +++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchConfigurationDelegate.java @@ -13,23 +13,25 @@ package net.sourceforge.phpdt.internal.launching; //import java.io.OutputStream; + import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; -import org.eclipse.debug.core.model.ILaunchConfigurationDelegate; +import org.eclipse.debug.core.model.LaunchConfigurationDelegate; +//import org.eclipse.debug.core.model.ILaunchConfigurationDelegate; -public class PHPLaunchConfigurationDelegate implements ILaunchConfigurationDelegate { +public class PHPLaunchConfigurationDelegate extends LaunchConfigurationDelegate { protected static final InterpreterRunner interpreterRunner = new InterpreterRunner(); protected static final DebuggerRunner debuggerRunner = new DebuggerRunner(); - public PHPLaunchConfigurationDelegate() { +/* public PHPLaunchConfigurationDelegate() { super(); } - +*/ /** * @see ILaunchConfigurationDelegate#launch(ILaunchConfiguration, String, ILaunch, IProgressMonitor) */ diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchingPlugin.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchingPlugin.java index 7d55467..4627f20 100644 --- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchingPlugin.java +++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchingPlugin.java @@ -3,7 +3,6 @@ package net.sourceforge.phpdt.internal.launching; import net.sourceforge.phpeclipse.PHPeclipsePlugin; import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.runtime.IPluginDescriptor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.ui.plugin.AbstractUIPlugin; @@ -14,11 +13,10 @@ public class PHPLaunchingPlugin extends AbstractUIPlugin { protected static PHPLaunchingPlugin plugin; - public PHPLaunchingPlugin(IPluginDescriptor descriptor) { - super(descriptor); + public PHPLaunchingPlugin() { + super(); plugin = this; } - public static PHPLaunchingPlugin getDefault() { return plugin; } -- 1.7.1