removed NPE in XMLPreferenceInitializer

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / preferences / PHPProjectLibraryPage.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPProjectLibraryPage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPProjectLibraryPage.java
index 618e810..bd918f6 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPProjectLibraryPage.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPProjectLibraryPage.java
@@ -5,6 +5,9 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
+import net.sourceforge.phpdt.internal.core.JavaProject;
+import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.runtime.CoreException;
@@ -25,13 +28,11 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.IWorkbench;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpeclipse.resourcesview.PHPProject;
 
 public class PHPProjectLibraryPage {
-  protected PHPProject workingProject;
+  protected JavaProject workingProject;
 
-  protected PHPProjectLibraryPage(PHPProject theWorkingProject) {
+  protected PHPProjectLibraryPage(JavaProject theWorkingProject) {
     super();
     workingProject = theWorkingProject;
   }
@@ -47,7 +48,7 @@ public class PHPProjectLibraryPage {
 
     TableColumn tableColumn = new TableColumn(projectsTable, SWT.NONE);
     tableColumn.setWidth(200);
-    tableColumn.setText(PHPPreferencesMessages.getString("PHPProjectLibraryPage.project")); //$NON-NLS-1$
+    tableColumn.setText(PHPPreferencesMessages.getString("PHPEditorPreferencePageLibraryPage.project")); //$NON-NLS-1$
 
     CheckboxTableViewer projectsTableViewer = new CheckboxTableViewer(projectsTable);
     projectsTableViewer.addCheckStateListener(new ICheckStateListener() {
@@ -73,7 +74,7 @@ public class PHPProjectLibraryPage {
       getWorkingProject().removeLoadPathEntry(checkEventProject);
   }
 
-  protected PHPProject getWorkingProject() {
+  protected JavaProject getWorkingProject() {
     return workingProject;
   }
 
@@ -93,7 +94,7 @@ public class PHPProjectLibraryPage {
         if (element instanceof IProject)
           return ((IProject) element).getName();
 
-        return PHPPreferencesMessages.getString("PHPProjectLibraryPage.elementNotIProject"); //$NON-NLS-1$
+        return PHPPreferencesMessages.getString("PHPEditorPreferencePageLibraryPage.elementNotIProject"); //$NON-NLS-1$
       }
 
       public void addListener(ILabelProviderListener listener) {
@@ -115,17 +116,17 @@ public class PHPProjectLibraryPage {
 
   protected IContentProvider getContentProvider() {
     IStructuredContentProvider contentProvider = new IStructuredContentProvider() {
-      protected List phpProjects;
+      protected List PHPEditorPreferencePages;
 
       public Object[] getElements(Object inputElement) {
-        return phpProjects.toArray();
+        return PHPEditorPreferencePages.toArray();
       }
 
       public void dispose() {
       }
 
       public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-        phpProjects = new ArrayList();
+        PHPEditorPreferencePages = new ArrayList();
 
         if (!(newInput instanceof List))
           return;
@@ -138,7 +139,7 @@ public class PHPProjectLibraryPage {
             if (project.getName() != workingProject.getProject().getName()) {
               try {
                 if (project.hasNature(PHPeclipsePlugin.PHP_NATURE_ID))
-                  phpProjects.add(project);
+                  PHPEditorPreferencePages.add(project);
               } catch (CoreException e) {
               }
             }