1) Reintroduced PHPPerspectiveFactory (was lost with refactoring).

[phpeclipse.git] / net.sourceforge.phpeclipse.ui / src / net / sourceforge / phpdt / internal / corext / template / php / CompilationUnitCompletion.java

diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/corext/template/php/CompilationUnitCompletion.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/corext/template/php/CompilationUnitCompletion.java
index 7684b9d..eae8473 100644 (file)
--- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/corext/template/php/CompilationUnitCompletion.java
+++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/corext/template/php/CompilationUnitCompletion.java
@@ -12,10 +12,10 @@ package net.sourceforge.phpdt.internal.corext.template.php;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
+//import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Vector;
+//import java.util.Vector;
 
 import net.sourceforge.phpdt.core.CompletionRequestorAdapter;
 import net.sourceforge.phpdt.core.ICompilationUnit;
@@ -41,13 +41,13 @@ class CompilationUnitCompletion extends CompletionRequestorAdapter {
                }
        }
 
-       private ICompilationUnit fUnit;
+       //private ICompilationUnit fUnit;
 
        private List fLocalVariables = new ArrayList();
 
        private Map fTypes = new HashMap();
 
-       private boolean fError;
+       //private boolean fError;
 
        /**
         * Creates a compilation unit completion.
@@ -66,19 +66,19 @@ class CompilationUnitCompletion extends CompletionRequestorAdapter {
         *            the compilation unit, may be <code>null</code>.
         */
        public void reset(ICompilationUnit unit) {
-               fUnit = unit;
+               //fUnit = unit;
 
                fLocalVariables.clear();
                fTypes.clear();
 
-               fError = false;
+               //fError = false;
        }
 
        /*
         * @see ICompletionRequestor#acceptError(IProblem)
         */
        public void acceptError(IProblem error) {
-               fError = true;
+               //fError = true;
        }
 
        /*
@@ -96,44 +96,44 @@ class CompilationUnitCompletion extends CompletionRequestorAdapter {
        /**
         * Tests if the code completion process produced errors.
         */
-       public boolean hasErrors() {
-               return fError;
-       }
-
-       boolean existsLocalName(String name) {
-               for (Iterator iterator = fLocalVariables.iterator(); iterator.hasNext();) {
-                       LocalVariable localVariable = (LocalVariable) iterator.next();
-
-                       if (localVariable.name.equals(name))
-                               return true;
-               }
-
-               return false;
-       }
-
-       String[] getLocalVariableNames() {
-               String[] res = new String[fLocalVariables.size()];
-               int i = 0;
-               for (Iterator iterator = fLocalVariables.iterator(); iterator.hasNext();) {
-                       LocalVariable localVariable = (LocalVariable) iterator.next();
-                       res[i++] = localVariable.name;
-               }
-               return res;
-       }
-
-       LocalVariable[] findLocalArrays() {
-               Vector vector = new Vector();
-
-               for (Iterator iterator = fLocalVariables.iterator(); iterator.hasNext();) {
-                       LocalVariable localVariable = (LocalVariable) iterator.next();
-
-                       if (isArray(localVariable.typeName))
-                               vector.add(localVariable);
-               }
-
-               return (LocalVariable[]) vector
-                               .toArray(new LocalVariable[vector.size()]);
-       }
+//     public boolean hasErrors() {
+//             return fError;
+//     }
+
+//     boolean existsLocalName(String name) {
+//             for (Iterator iterator = fLocalVariables.iterator(); iterator.hasNext();) {
+//                     LocalVariable localVariable = (LocalVariable) iterator.next();
+//
+//                     if (localVariable.name.equals(name))
+//                             return true;
+//             }
+//
+//             return false;
+//     }
+
+//     String[] getLocalVariableNames() {
+//             String[] res = new String[fLocalVariables.size()];
+//             int i = 0;
+//             for (Iterator iterator = fLocalVariables.iterator(); iterator.hasNext();) {
+//                     LocalVariable localVariable = (LocalVariable) iterator.next();
+//                     res[i++] = localVariable.name;
+//             }
+//             return res;
+//     }
+
+//     LocalVariable[] findLocalArrays() {
+//             Vector vector = new Vector();
+//
+//             for (Iterator iterator = fLocalVariables.iterator(); iterator.hasNext();) {
+//                     LocalVariable localVariable = (LocalVariable) iterator.next();
+//
+//                     if (isArray(localVariable.typeName))
+//                             vector.add(localVariable);
+//             }
+//
+//             return (LocalVariable[]) vector
+//                             .toArray(new LocalVariable[vector.size()]);
+//     }
 
        // LocalVariable[] findLocalCollections() throws JavaModelException {
        // Vector vector= new Vector();
@@ -155,13 +155,13 @@ class CompilationUnitCompletion extends CompletionRequestorAdapter {
        // LocalVariable[vector.size()]);
        // }
 
-       String simplifyTypeName(String qualifiedName) {
-               return (String) fTypes.get(qualifiedName);
-       }
+//     String simplifyTypeName(String qualifiedName) {
+//             return (String) fTypes.get(qualifiedName);
+//     }
 
-       private static boolean isArray(String type) {
-               return type.endsWith("[]"); //$NON-NLS-1$
-       }
+//     private static boolean isArray(String type) {
+//             return type.endsWith("[]"); //$NON-NLS-1$
+//     }
 
        // returns fully qualified name if successful
        // private String qualify(String typeName) throws JavaModelException {