Fix for ticket #358 Interpreter Tab in Mac OSX from mbowie testing and confirming...

[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 98d1cff..c088627 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;
@@ -23,15 +26,13 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 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; 
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.ide.IDE.SharedImages;
 
 public class PHPProjectLibraryPage {
-       protected PHPProject workingProject;
+       protected JavaProject workingProject;
 
-       protected PHPProjectLibraryPage(PHPProject theWorkingProject) {
+       protected PHPProjectLibraryPage(JavaProject theWorkingProject) {
                super();
                workingProject = theWorkingProject;
        }
@@ -40,16 +41,19 @@ public class PHPProjectLibraryPage {
                Composite composite = new Composite(parent, SWT.NONE);
                composite.setLayout(new FillLayout());
 
-               Table projectsTable = new Table(composite, SWT.CHECK | SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION);
+               Table projectsTable = new Table(composite, SWT.CHECK | SWT.BORDER
+                               | SWT.MULTI | SWT.FULL_SELECTION);
                projectsTable.setHeaderVisible(false);
                projectsTable.setLinesVisible(false);
                projectsTable.computeSize(SWT.DEFAULT, SWT.DEFAULT);
 
                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);
+               CheckboxTableViewer projectsTableViewer = new CheckboxTableViewer(
+                               projectsTable);
                projectsTableViewer.addCheckStateListener(new ICheckStateListener() {
                        public void checkStateChanged(CheckStateChangedEvent event) {
                                projectCheckedUnchecked(event);
@@ -60,7 +64,8 @@ public class PHPProjectLibraryPage {
                projectsTableViewer.setLabelProvider(getLabelProvider());
 
                projectsTableViewer.setInput(getWorkspaceProjects());
-               projectsTableViewer.setCheckedElements(workingProject.getReferencedProjects().toArray());
+               projectsTableViewer.setCheckedElements(workingProject
+                               .getReferencedProjects().toArray());
 
                return composite;
        }
@@ -73,7 +78,7 @@ public class PHPProjectLibraryPage {
                        getWorkingProject().removeLoadPathEntry(checkEventProject);
        }
 
-       protected PHPProject getWorkingProject() {
+       protected JavaProject getWorkingProject() {
                return workingProject;
        }
 
@@ -85,26 +90,32 @@ public class PHPProjectLibraryPage {
        protected ITableLabelProvider getLabelProvider() {
                ITableLabelProvider labelProvider = new ITableLabelProvider() {
                        public Image getColumnImage(Object element, int columnIndex) {
-                               IWorkbench workbench= PHPeclipsePlugin.getDefault().getWorkbench();
-                               return workbench.getSharedImages().getImage(ISharedImages.IMG_OBJ_PROJECT);
+                               IWorkbench workbench = PHPeclipsePlugin.getDefault()
+                                               .getWorkbench();
+                               return workbench.getSharedImages().getImage(
+                                               SharedImages.IMG_OBJ_PROJECT);
                        }
 
                        public String getColumnText(Object element, int columnIndex) {
                                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) {}
+                       public void addListener(ILabelProviderListener listener) {
+                       }
 
-                       public void dispose() {}
+                       public void dispose() {
+                       }
 
                        public boolean isLabelProperty(Object element, String property) {
                                return false;
                        }
 
-                       public void removeListener(ILabelProviderListener listener) {}
+                       public void removeListener(ILabelProviderListener listener) {
+                       }
                };
 
                return labelProvider;
@@ -112,30 +123,36 @@ 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 dispose() {
+                       }
 
-                       public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-                               phpProjects = new ArrayList();
+                       public void inputChanged(Viewer viewer, Object oldInput,
+                                       Object newInput) {
+                               PHPEditorPreferencePages = new ArrayList();
 
                                if (!(newInput instanceof List))
                                        return;
 
-                               Iterator workspaceProjectsIterator = ((List) newInput).iterator();
+                               Iterator workspaceProjectsIterator = ((List) newInput)
+                                               .iterator();
                                while (workspaceProjectsIterator.hasNext()) {
                                        Object anObject = workspaceProjectsIterator.next();
                                        if (anObject instanceof IProject) {
                                                IProject project = (IProject) anObject;
-                                               if (project.getName() != workingProject.getProject().getName()) {
+                                               if (project.getName() != workingProject.getProject()
+                                                               .getName()) {
                                                        try {
-                                                               if (project.hasNature(PHPeclipsePlugin.PHP_NATURE_ID))
-                                                                       phpProjects.add(project);
-                                                       } catch (CoreException e) {}
+                                                               if (project
+                                                                               .hasNature(PHPeclipsePlugin.PHP_NATURE_ID))
+                                                                       PHPEditorPreferencePages.add(project);
+                                                       } catch (CoreException e) {
+                                                       }
                                                }
                                        }
                                }