Modified: 1216132 - Error when debugging eval()'d code

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

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 e336c0b..2f3ba51 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPProjectPropertyPage.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPProjectPropertyPage.java
@@ -19,79 +19,84 @@ import org.eclipse.swt.widgets.TabItem;
 import org.eclipse.ui.IWorkbenchPropertyPage;
 import org.eclipse.ui.dialogs.PropertyPage;
 
-public class PHPProjectPropertyPage extends PropertyPage implements IWorkbenchPropertyPage {
-  protected PHPProjectLibraryPage projectsPage;
-  protected JavaProject workingProject;
-
-  public PHPProjectPropertyPage() {
-  }
-
-  protected Control createContents(Composite parent) {
-    noDefaultAndApplyButton();
-
-    workingProject = getPHPProject();
-    if (workingProject == null || !workingProject.getProject().isOpen())
-      return createClosedProjectPageContents(parent);
-
-    return createProjectPageContents(parent);
-  }
-
-  protected JavaProject getPHPProject() {
-    IAdaptable selectedElement = getElement();
-    if (selectedElement == null)
-      return null;
-
-    if (selectedElement instanceof JavaProject)
-      return (JavaProject) selectedElement;
-
-    if (selectedElement instanceof IProject) {
-      IProject simpleProject = (IProject) selectedElement;
-      try {
-        if (simpleProject.hasNature(PHPeclipsePlugin.PHP_NATURE_ID)) {
-          JavaProject phpProject = new JavaProject();
-          phpProject.setProject(simpleProject);
-          return phpProject;
-        }
-      } 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$
-
-    return label;
-  }
-
-  protected Control createProjectPageContents(Composite parent) {
-    TabFolder tabFolder = new TabFolder(parent, SWT.NONE);
-    tabFolder.setLayout(new GridLayout());
-    tabFolder.setLayoutData(new GridData(GridData.FILL_BOTH));
-    tabFolder.addSelectionListener(new SelectionAdapter() {
-      public void widgetSelected(SelectionEvent e) {
-        //tabChanged(e.item);
-      }
-    });
-
-    projectsPage = new PHPProjectLibraryPage(workingProject);
-    TabItem tabItem = new TabItem(tabFolder, SWT.NONE);
-    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);
-    }
-    return super.performOk();
-  }
+public class PHPProjectPropertyPage extends PropertyPage implements
+               IWorkbenchPropertyPage {
+       protected PHPProjectLibraryPage projectsPage;
+
+       protected JavaProject workingProject;
+
+       public PHPProjectPropertyPage() {
+       }
+
+       protected Control createContents(Composite parent) {
+               noDefaultAndApplyButton();
+
+               workingProject = getPHPProject();
+               if (workingProject == null || !workingProject.getProject().isOpen())
+                       return createClosedProjectPageContents(parent);
+
+               return createProjectPageContents(parent);
+       }
+
+       protected JavaProject getPHPProject() {
+               IAdaptable selectedElement = getElement();
+               if (selectedElement == null)
+                       return null;
+
+               if (selectedElement instanceof JavaProject)
+                       return (JavaProject) selectedElement;
+
+               if (selectedElement instanceof IProject) {
+                       IProject simpleProject = (IProject) selectedElement;
+                       try {
+                               if (simpleProject.hasNature(PHPeclipsePlugin.PHP_NATURE_ID)) {
+                                       JavaProject phpProject = new JavaProject();
+                                       phpProject.setProject(simpleProject);
+                                       return phpProject;
+                               }
+                       } 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$
+
+               return label;
+       }
+
+       protected Control createProjectPageContents(Composite parent) {
+               TabFolder tabFolder = new TabFolder(parent, SWT.NONE);
+               tabFolder.setLayout(new GridLayout());
+               tabFolder.setLayoutData(new GridData(GridData.FILL_BOTH));
+               tabFolder.addSelectionListener(new SelectionAdapter() {
+                       public void widgetSelected(SelectionEvent e) {
+                               // tabChanged(e.item);
+                       }
+               });
+
+               projectsPage = new PHPProjectLibraryPage(workingProject);
+               TabItem tabItem = new TabItem(tabFolder, SWT.NONE);
+               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);
+               }
+               return super.performOk();
+       }
 
 }