X-Git-Url: http://git.phpeclipse.com

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 836c07e..e767a84 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
@@ -10,17 +10,17 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.debug.ui.actions;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+//import java.util.ArrayList;
+//import java.util.Iterator;
+//import java.util.List;
 
-import net.sourceforge.phpdt.core.Flags;
-import net.sourceforge.phpdt.core.ICompilationUnit;
-import net.sourceforge.phpdt.core.IJavaElement;
-import net.sourceforge.phpdt.core.IMethod;
-import net.sourceforge.phpdt.core.IType;
-import net.sourceforge.phpdt.core.JavaModelException;
-import net.sourceforge.phpdt.core.Signature;
+//import net.sourceforge.phpdt.core.Flags;
+//import net.sourceforge.phpdt.core.ICompilationUnit;
+//import net.sourceforge.phpdt.core.IJavaElement;
+//import net.sourceforge.phpdt.core.IMethod;
+//import net.sourceforge.phpdt.core.IType;
+//import net.sourceforge.phpdt.core.JavaModelException;
+//import net.sourceforge.phpdt.core.Signature;
 import net.sourceforge.phpdt.debug.core.PHPDebugModel;
 import net.sourceforge.phpdt.internal.debug.core.breakpoints.PHPLineBreakpoint;
 import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin;
@@ -33,7 +33,7 @@ import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget;
 //import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.ITextSelection;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
+//import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IFileEditorInput;
@@ -133,7 +133,7 @@ public class ToggleBreakpointAdapter implements IToggleBreakpointsTarget {
 
 				// String typeName= null;
 				IResource resource;
-				PHPLineBreakpoint breakpoint = null;
+				//PHPLineBreakpoint breakpoint = null;
 				// if (type == null) {
 				if (editorInput instanceof IFileEditorInput) {
 					resource = ((IFileEditorInput) editorInput).getFile();
@@ -159,8 +159,8 @@ public class ToggleBreakpointAdapter implements IToggleBreakpointsTarget {
 							.removeBreakpoint(existingBreakpoint, true);
 					return;
 				} else {
-					breakpoint = PHPDebugModel.createLineBreakpoint(resource,
-							lineNumber, 0, true, null);
+//					breakpoint = PHPDebugModel.createLineBreakpoint(resource,
+//							lineNumber, 0, true, null);
 				}
 				// }
 				// new BreakpointLocationVerifierJob(document, breakpoint,
@@ -312,25 +312,25 @@ public class ToggleBreakpointAdapter implements IToggleBreakpointsTarget {
 		return false;
 	}
 
-	protected IMethod[] getMethods(IStructuredSelection selection) {
-		if (selection.isEmpty()) {
-			return new IMethod[0];
-		} else {
-			List methods = new ArrayList(selection.size());
-			Iterator iterator = selection.iterator();
-			while (iterator.hasNext()) {
-				Object thing = iterator.next();
-				try {
-					if (thing instanceof IMethod
-							&& !Flags.isAbstract(((IMethod) thing).getFlags())) {
-						methods.add(thing);
-					}
-				} catch (JavaModelException e) {
-				}
-			}
-			return (IMethod[]) methods.toArray(new IMethod[methods.size()]);
-		}
-	}
+//	protected IMethod[] getMethods(IStructuredSelection selection) {
+//		if (selection.isEmpty()) {
+//			return new IMethod[0];
+//		} else {
+//			List methods = new ArrayList(selection.size());
+//			Iterator iterator = selection.iterator();
+//			while (iterator.hasNext()) {
+//				Object thing = iterator.next();
+//				try {
+//					if (thing instanceof IMethod
+//							&& !Flags.isAbstract(((IMethod) thing).getFlags())) {
+//						methods.add(thing);
+//					}
+//				} catch (JavaModelException e) {
+//				}
+//			}
+//			return (IMethod[]) methods.toArray(new IMethod[methods.size()]);
+//		}
+//	}
 
 	// protected IField[] getFields(IStructuredSelection selection) {
 	// if (selection.isEmpty()) {
@@ -433,65 +433,65 @@ public class ToggleBreakpointAdapter implements IToggleBreakpointsTarget {
 		// }
 	}
 
-	public static String resolveMethodSignature(IType type,
-			String methodSignature) throws JavaModelException {
-		String[] parameterTypes = Signature.getParameterTypes(methodSignature);
-		int length = parameterTypes.length;
-		String[] resolvedParameterTypes = new String[length];
-
-		for (int i = 0; i < length; i++) {
-			resolvedParameterTypes[i] = resolveType(type, parameterTypes[i]);
-			if (resolvedParameterTypes[i] == null) {
-				return null;
-			}
-		}
-
-		String resolvedReturnType = resolveType(type, Signature
-				.getReturnType(methodSignature));
-		if (resolvedReturnType == null) {
-			return null;
-		}
-
-		return Signature.createMethodSignature(resolvedParameterTypes,
-				resolvedReturnType);
-	}
+//	public static String resolveMethodSignature(IType type,
+//			String methodSignature) throws JavaModelException {
+//		String[] parameterTypes = Signature.getParameterTypes(methodSignature);
+//		int length = parameterTypes.length;
+//		String[] resolvedParameterTypes = new String[length];
+//
+//		for (int i = 0; i < length; i++) {
+//			resolvedParameterTypes[i] = resolveType(type, parameterTypes[i]);
+//			if (resolvedParameterTypes[i] == null) {
+//				return null;
+//			}
+//		}
+//
+//		String resolvedReturnType = resolveType(type, Signature
+//				.getReturnType(methodSignature));
+//		if (resolvedReturnType == null) {
+//			return null;
+//		}
+//
+//		return Signature.createMethodSignature(resolvedParameterTypes,
+//				resolvedReturnType);
+//	}
 
-	private static String resolveType(IType type, String typeSignature)
-			throws JavaModelException {
-		// int count= Signature.getArrayCount(typeSignature);
-		// String elementTypeSignature= Signature.getElementType(typeSignature);
-		// if (elementTypeSignature.length() == 1) {
-		// // no need to resolve primitive types
-		// return typeSignature;
-		// }
-		// String elementTypeName= Signature.toString(elementTypeSignature);
-		// String[][] resolvedElementTypeNames=
-		// type.resolveType(elementTypeName);
-		// if (resolvedElementTypeNames == null ||
-		// resolvedElementTypeNames.length != 1) {
-		// // the type name cannot be resolved
-		// return null;
-		// }
-		// String resolvedElementTypeName=
-		// Signature.toQualifiedName(resolvedElementTypeNames[0]);
-		// String resolvedElementTypeSignature=
-		// Signature.createTypeSignature(resolvedElementTypeName,
-		// true).replace('.', '/');
-		// return Signature.createArraySignature(resolvedElementTypeSignature,
-		// count);
-		return "";
-	}
+//	private static String resolveType(IType type, String typeSignature)
+//			throws JavaModelException {
+//		// int count= Signature.getArrayCount(typeSignature);
+//		// String elementTypeSignature= Signature.getElementType(typeSignature);
+//		// if (elementTypeSignature.length() == 1) {
+//		// // no need to resolve primitive types
+//		// return typeSignature;
+//		// }
+//		// String elementTypeName= Signature.toString(elementTypeSignature);
+//		// String[][] resolvedElementTypeNames=
+//		// type.resolveType(elementTypeName);
+//		// if (resolvedElementTypeNames == null ||
+//		// resolvedElementTypeNames.length != 1) {
+//		// // the type name cannot be resolved
+//		// return null;
+//		// }
+//		// String resolvedElementTypeName=
+//		// Signature.toQualifiedName(resolvedElementTypeNames[0]);
+//		// String resolvedElementTypeSignature=
+//		// Signature.createTypeSignature(resolvedElementTypeName,
+//		// true).replace('.', '/');
+//		// return Signature.createArraySignature(resolvedElementTypeSignature,
+//		// count);
+//		return "";
+//	}
 
-	protected static IResource getResource(IEditorPart editor) {
-		IResource resource;
-		IEditorInput editorInput = editor.getEditorInput();
-		if (editorInput instanceof IFileEditorInput) {
-			resource = ((IFileEditorInput) editorInput).getFile();
-		} else {
-			resource = ResourcesPlugin.getWorkspace().getRoot();
-		}
-		return resource;
-	}
+//	protected static IResource getResource(IEditorPart editor) {
+//		IResource resource;
+//		IEditorInput editorInput = editor.getEditorInput();
+//		if (editorInput instanceof IFileEditorInput) {
+//			resource = ((IFileEditorInput) editorInput).getFile();
+//		} else {
+//			resource = ResourcesPlugin.getWorkspace().getRoot();
+//		}
+//		return resource;
+//	}
 
 	/**
 	 * Returns a handle to the specified method or <code>null</code> if none.
@@ -503,29 +503,29 @@ public class ToggleBreakpointAdapter implements IToggleBreakpointsTarget {
 	 * @param signature
 	 * @return handle or <code>null</code>
 	 */
-	protected IMethod getMethodHandle(IEditorPart editorPart, String typeName,
-			String methodName, String signature) throws CoreException {
-		IJavaElement element = (IJavaElement) editorPart.getEditorInput()
-				.getAdapter(IJavaElement.class);
-		IType type = null;
-		if (element instanceof ICompilationUnit) {
-			IType[] types = ((ICompilationUnit) element).getAllTypes();
-			for (int i = 0; i < types.length; i++) {
-				if (types[i].getFullyQualifiedName().equals(typeName)) {
-					type = types[i];
-					break;
-				}
-			}
-		}
-		// else if (element instanceof IClassFile) {
-		// type = ((IClassFile)element).getType();
-		// }
-		if (type != null) {
-			String[] sigs = Signature.getParameterTypes(signature);
-			return type.getMethod(methodName, sigs);
-		}
-		return null;
-	}
+//	protected IMethod getMethodHandle(IEditorPart editorPart, String typeName,
+//			String methodName, String signature) throws CoreException {
+//		IJavaElement element = (IJavaElement) editorPart.getEditorInput()
+//				.getAdapter(IJavaElement.class);
+//		IType type = null;
+//		if (element instanceof ICompilationUnit) {
+//			IType[] types = ((ICompilationUnit) element).getAllTypes();
+//			for (int i = 0; i < types.length; i++) {
+//				if (types[i].getFullyQualifiedName().equals(typeName)) {
+//					type = types[i];
+//					break;
+//				}
+//			}
+//		}
+//		// else if (element instanceof IClassFile) {
+//		// type = ((IClassFile)element).getType();
+//		// }
+//		if (type != null) {
+//			String[] sigs = Signature.getParameterTypes(signature);
+//			return type.getMethod(methodName, sigs);
+//		}
+//		return null;
+//	}
 
 	// protected IJavaBreakpoint getBreakpoint(IMember element) {
 	// IBreakpointManager breakpointManager=