unification of bug fixes 1198893, 1404228

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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/StandardJavaElementContentProvider.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/StandardJavaElementContentProvider.java
index 21b7dc1..31c8017 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/StandardJavaElementContentProvider.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/StandardJavaElementContentProvider.java
@@ -22,9 +22,9 @@ import net.sourceforge.phpdt.core.IPackageFragment;
 import net.sourceforge.phpdt.core.IPackageFragmentRoot;
 import net.sourceforge.phpdt.core.IParent;
 import net.sourceforge.phpdt.core.ISourceReference;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.internal.corext.util.JavaModelUtil;
-import net.sourceforge.phpeclipse.PHPCore;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -64,8 +64,8 @@ Java model (<code>IJavaModel</code>)
  * compilation units in the Java element hierarchy for which a shared working copy exists 
  * in JDT core.
  * 
- * @see org.eclipse.jdt.ui.IWorkingCopyProvider
- * @see JavaCore#getSharedWorkingCopies(org.eclipse.jdt.core.IBufferFactory)
+ * @see net.sourceforge.phpdt.ui.IWorkingCopyProvider
+ * @see JavaCore#getSharedWorkingCopies(net.sourceforge.phpdt.core.IBufferFactory)
  * 
  * @since 2.0
  */
@@ -318,7 +318,7 @@ public class StandardJavaElementContentProvider implements ITreeContentProvider,
                                // Included is a member of excluded, but since it is rendered as a source
                                // folder we have to exclude it as a normal child.
                                if (o instanceof IFolder) {
-                                       IJavaElement element= PHPCore.create((IFolder)o);
+                                       IJavaElement element= JavaCore.create((IFolder)o);
                                        if (element instanceof IPackageFragmentRoot && element.exists()) {
                                                continue;
                                        }
@@ -408,7 +408,7 @@ public class StandardJavaElementContentProvider implements ITreeContentProvider,
                // try to map resources to the containing package fragment
                if (element instanceof IResource) {
                        IResource parent= ((IResource)element).getParent();
-                       IJavaElement jParent= PHPCore.create(parent);
+                       IJavaElement jParent= JavaCore.create(parent);
                        // http://bugs.eclipse.org/bugs/show_bug.cgi?id=31374
                        if (jParent != null && jParent.exists()) 
                                return jParent;