X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPProjectPropertyPage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPProjectPropertyPage.java index fa07e17..2f3ba51 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPProjectPropertyPage.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPProjectPropertyPage.java @@ -1,7 +1,7 @@ package net.sourceforge.phpeclipse.preferences; +import net.sourceforge.phpdt.internal.core.JavaProject; import net.sourceforge.phpeclipse.PHPeclipsePlugin; -import net.sourceforge.phpeclipse.resourcesview.PHPProject; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; @@ -19,14 +19,16 @@ import org.eclipse.swt.widgets.TabItem; import org.eclipse.ui.IWorkbenchPropertyPage; import org.eclipse.ui.dialogs.PropertyPage; -public class PHPProjectPropertyPage extends PropertyPage implements IWorkbenchPropertyPage { +public class PHPProjectPropertyPage extends PropertyPage implements + IWorkbenchPropertyPage { protected PHPProjectLibraryPage projectsPage; - protected PHPProject workingProject; - + + protected JavaProject workingProject; + public PHPProjectPropertyPage() { } - protected Control createContents(Composite parent) { + protected Control createContents(Composite parent) { noDefaultAndApplyButton(); workingProject = getPHPProject(); @@ -35,61 +37,64 @@ public class PHPProjectPropertyPage extends PropertyPage implements IWorkbenchPr return createProjectPageContents(parent); } - - protected PHPProject getPHPProject() { + + protected JavaProject getPHPProject() { IAdaptable selectedElement = getElement(); if (selectedElement == null) return null; - if (selectedElement instanceof PHPProject) - return (PHPProject) selectedElement; - + if (selectedElement instanceof JavaProject) + return (JavaProject) selectedElement; + if (selectedElement instanceof IProject) { IProject simpleProject = (IProject) selectedElement; try { if (simpleProject.hasNature(PHPeclipsePlugin.PHP_NATURE_ID)) { - PHPProject phpProject = new PHPProject(); + JavaProject phpProject = new JavaProject(); phpProject.setProject(simpleProject); return phpProject; } - } catch(CoreException e) { + } catch (CoreException e) { PHPeclipsePlugin.log(e); } } - + return null; } - + protected Control createClosedProjectPageContents(Composite parent) { Label label = new Label(parent, SWT.NONE); - label.setText(PHPPreferencesMessages.getString("PHPProjectPropertyPage.phpProjectClosed")); //$NON-NLS-1$ - + label.setText(PHPPreferencesMessages + .getString("PHPProjectPropertyPage.phpProjectClosed")); //$NON-NLS-1$ + return label; } - + protected Control createProjectPageContents(Composite parent) { TabFolder tabFolder = new TabFolder(parent, SWT.NONE); - tabFolder.setLayout(new GridLayout()); + tabFolder.setLayout(new GridLayout()); tabFolder.setLayoutData(new GridData(GridData.FILL_BOTH)); tabFolder.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { - //tabChanged(e.item); - } + // tabChanged(e.item); + } }); - projectsPage = new PHPProjectLibraryPage(workingProject); + projectsPage = new PHPProjectLibraryPage(workingProject); TabItem tabItem = new TabItem(tabFolder, SWT.NONE); - tabItem.setText(PHPPreferencesMessages.getString("PHPProjectLibraryPage.tabName")); //$NON-NLS-1$ -// tabItem.setData(projectsPage); + tabItem.setText(PHPPreferencesMessages + .getString("PHPProjectLibraryPage.tabName")); //$NON-NLS-1$ + // tabItem.setData(projectsPage); tabItem.setControl(projectsPage.getControl(tabFolder)); return tabFolder; } + public boolean performOk() { try { projectsPage.getWorkingProject().save(); } catch (CoreException e) { - PHPeclipsePlugin.log(e); + PHPeclipsePlugin.log(e); } return super.performOk(); }