X-Git-Url: http://git.phpeclipse.com 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 32749ce..4a69135 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPProjectLibraryPage.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPProjectLibraryPage.java @@ -5,8 +5,9 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; +import net.sourceforge.phpdt.internal.core.JavaProject; +import net.sourceforge.phpdt.internal.ui.preferences.PHPEditorPreferencePage; import net.sourceforge.phpeclipse.PHPeclipsePlugin; -import net.sourceforge.phpeclipse.resourcesview.PHPProject; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IWorkspaceRoot; @@ -30,9 +31,9 @@ import org.eclipse.ui.ISharedImages; import org.eclipse.ui.IWorkbench; public class PHPProjectLibraryPage { - protected PHPProject workingProject; + protected JavaProject workingProject; - protected PHPProjectLibraryPage(PHPProject theWorkingProject) { + protected PHPProjectLibraryPage(JavaProject theWorkingProject) { super(); workingProject = theWorkingProject; } @@ -48,7 +49,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() { @@ -74,7 +75,7 @@ public class PHPProjectLibraryPage { getWorkingProject().removeLoadPathEntry(checkEventProject); } - protected PHPProject getWorkingProject() { + protected JavaProject getWorkingProject() { return workingProject; } @@ -94,7 +95,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) { @@ -116,17 +117,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; @@ -139,7 +140,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) { } }