1) Fixed issue #852: Correct matching of closing brace with the according opening...

[phpeclipse.git] / net.sourceforge.phpeclipse.ui / src / net / sourceforge / phpdt / ui / StandardJavaElementContentProvider.java

diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/StandardJavaElementContentProvider.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/StandardJavaElementContentProvider.java
index 87d461c..5c10738 100644 (file)
--- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/StandardJavaElementContentProvider.java
+++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/StandardJavaElementContentProvider.java
@@ -15,7 +15,7 @@ import java.util.List;
 
 import net.sourceforge.phpdt.core.ICompilationUnit;
 import net.sourceforge.phpdt.core.IJavaElement;
-import net.sourceforge.phpdt.core.IJavaElementDelta;
+//import net.sourceforge.phpdt.core.IJavaElementDelta;
 import net.sourceforge.phpdt.core.IJavaModel;
 import net.sourceforge.phpdt.core.IJavaProject;
 import net.sourceforge.phpdt.core.IPackageFragment;
@@ -109,8 +109,8 @@ public class StandardJavaElementContentProvider implements
         * members of compilation units or class files and it does not provide
         * working copy elements.
         */
-       public StandardJavaElementContentProvider() {
-       }
+//     public StandardJavaElementContentProvider() {
+//     }
 
        /**
         * Creates a new <code>StandardJavaElementContentProvider</code>.
@@ -137,9 +137,9 @@ public class StandardJavaElementContentProvider implements
         * @return <code>true</code> if the content provider provides members;
         *         otherwise <code>false</code> is returned
         */
-       public boolean getProvideMembers() {
-               return fProvideMembers;
-       }
+//     public boolean getProvideMembers() {
+//             return fProvideMembers;
+//     }
 
        /**
         * Sets whether the content provider is supposed to return members when
@@ -150,9 +150,9 @@ public class StandardJavaElementContentProvider implements
         *            <code>false</code> compilation units and class files are the
         *            leaves provided by this content provider.
         */
-       public void setProvideMembers(boolean b) {
-               fProvideMembers = b;
-       }
+//     public void setProvideMembers(boolean b) {
+//             fProvideMembers = b;
+//     }
 
        /**
         * Returns whether the provided members are from a working copy or the
@@ -163,9 +163,9 @@ public class StandardJavaElementContentProvider implements
         * 
         * @see #setProvideWorkingCopy(boolean)
         */
-       public boolean getProvideWorkingCopy() {
-               return fProvideWorkingCopy;
-       }
+//     public boolean getProvideWorkingCopy() {
+//             return fProvideWorkingCopy;
+//     }
 
        /**
         * Sets whether the members are provided from a shared working copy that
@@ -176,9 +176,9 @@ public class StandardJavaElementContentProvider implements
         *            copy if one exists in JDT core. If <code>false</code> the
         *            provider always returns original elements.
         */
-       public void setProvideWorkingCopy(boolean b) {
-               fProvideWorkingCopy = b;
-       }
+//     public void setProvideWorkingCopy(boolean b) {
+//             fProvideWorkingCopy = b;
+//     }
 
        /*
         * (non-Javadoc)
@@ -384,17 +384,17 @@ public class StandardJavaElementContentProvider implements
         * Note: This method is for internal use only. Clients should not call this
         * method.
         */
-       protected boolean isClassPathChange(IJavaElementDelta delta) {
-
-               // need to test the flags only for package fragment roots
-               if (delta.getElement().getElementType() != IJavaElement.PACKAGE_FRAGMENT_ROOT)
-                       return false;
-
-               int flags = delta.getFlags();
-               return (delta.getKind() == IJavaElementDelta.CHANGED
-                               && ((flags & IJavaElementDelta.F_ADDED_TO_CLASSPATH) != 0)
-                               || ((flags & IJavaElementDelta.F_REMOVED_FROM_CLASSPATH) != 0) || ((flags & IJavaElementDelta.F_REORDER) != 0));
-       }
+//     protected boolean isClassPathChange(IJavaElementDelta delta) {
+//
+//             // need to test the flags only for package fragment roots
+//             if (delta.getElement().getElementType() != IJavaElement.PACKAGE_FRAGMENT_ROOT)
+//                     return false;
+//
+//             int flags = delta.getFlags();
+//             return (delta.getKind() == IJavaElementDelta.CHANGED
+//                             && ((flags & IJavaElementDelta.F_ADDED_TO_CLASSPATH) != 0)
+//                             || ((flags & IJavaElementDelta.F_REMOVED_FROM_CLASSPATH) != 0) || ((flags & IJavaElementDelta.F_REORDER) != 0));
+//     }
 
        /**
         * Note: This method is for internal use only. Clients should not call this
@@ -414,18 +414,18 @@ public class StandardJavaElementContentProvider implements
         * Note: This method is for internal use only. Clients should not call this
         * method.
         */
-       protected boolean isPackageFragmentEmpty(IJavaElement element)
-                       throws JavaModelException {
-               if (element instanceof IPackageFragment) {
-                       IPackageFragment fragment = (IPackageFragment) element;
-                       if (!(fragment.hasChildren()))
-                               // ||
-                               // fragment.getNonJavaResources().length > 0) &&
-                               // fragment.hasSubpackages())
-                               return true;
-               }
-               return false;
-       }
+//     protected boolean isPackageFragmentEmpty(IJavaElement element)
+//                     throws JavaModelException {
+//             if (element instanceof IPackageFragment) {
+//                     IPackageFragment fragment = (IPackageFragment) element;
+//                     if (!(fragment.hasChildren()))
+//                             // ||
+//                             // fragment.getNonJavaResources().length > 0) &&
+//                             // fragment.hasSubpackages())
+//                             return true;
+//             }
+//             return false;
+//     }
 
        /**
         * Note: This method is for internal use only. Clients should not call this
@@ -499,13 +499,13 @@ public class StandardJavaElementContentProvider implements
         * Note: This method is for internal use only. Clients should not call this
         * method.
         */
-       protected static Object[] concatenate(Object[] a1, Object[] a2) {
-               int a1Len = a1.length;
-               int a2Len = a2.length;
-               Object[] res = new Object[a1Len + a2Len];
-               System.arraycopy(a1, 0, res, 0, a1Len);
-               System.arraycopy(a2, 0, res, a1Len, a2Len);
-               return res;
-       }
+//     protected static Object[] concatenate(Object[] a1, Object[] a2) {
+//             int a1Len = a1.length;
+//             int a2Len = a2.length;
+//             Object[] res = new Object[a1Len + a2Len];
+//             System.arraycopy(a1, 0, res, 0, a1Len);
+//             System.arraycopy(a2, 0, res, a1Len, a2Len);
+//             return res;
+//     }
 
 }