Avoid NPE in update OccurrenceAnnotation

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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java
index 7dddc0f..4460b0b 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java
@@ -13,6 +13,7 @@ package net.sourceforge.phpdt.ui.wizards;
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IJavaProject;
 import net.sourceforge.phpdt.core.IPackageFragmentRoot;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.externaltools.internal.ui.StatusInfo;
 import net.sourceforge.phpdt.internal.ui.viewsupport.IViewPartInputProvider;
@@ -22,7 +23,6 @@ import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.IDialogFieldListen
 import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
 import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.LayoutUtil;
 import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
-import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IProject;
@@ -141,7 +141,7 @@ public abstract class NewContainerWizardPage extends NewElementWizardPage {
                                                        jelem= (IJavaElement) resource.getAdapter(IJavaElement.class);
                                                }
                                                if (jelem == null) {
-                                                       jelem= PHPCore.create(resource); // java project
+                                                       jelem= JavaCore.create(resource); // java project
                                                }
                                        }
                                }
@@ -163,7 +163,7 @@ public abstract class NewContainerWizardPage extends NewElementWizardPage {
 
                if (jelem == null || jelem.getElementType() == IJavaElement.JAVA_MODEL) {
                        try {
-                               IJavaProject[] projects= PHPCore.create(getWorkspaceRoot()).getJavaProjects();
+                               IJavaProject[] projects= JavaCore.create(getWorkspaceRoot()).getJavaProjects();
                                if (projects.length == 1) {
                                        jelem= projects[0];
                                }
@@ -270,7 +270,7 @@ public abstract class NewContainerWizardPage extends NewElementWizardPage {
                                        status.setError(NewWizardMessages.getFormattedString("NewContainerWizardPage.error.ProjectClosed", proj.getFullPath().toString())); //$NON-NLS-1$
                                        return status;
                                }                               
-                               IJavaProject jproject= PHPCore.create(proj);
+                               IJavaProject jproject= JavaCore.create(proj);
 //                             fCurrRoot= jproject.getPackageFragmentRoot(res);
 //                             if (res.exists()) {
 //                                     try {