remove name clash with JDT editor category

[phpeclipse.git] / net.sourceforge.phpeclipse.phpunit / src / net / sourceforge / phpeclipse / phpunit / PHPUnitView.java

diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java
index e304352..46a1f82 100644 (file)
--- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java
+++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java
@@ -1,3 +1,11 @@
+/*************************************************************************
+ * @author Ali Echihabi (ali_echihabi@ieee.org, ali.echihabi@souss.ca)
+ *
+ * Plugin for PHP unit Testing.
+ * www.phpeclipse.de
+ * 
+ *************************************************************************/
+
 package net.sourceforge.phpeclipse.phpunit;
 
 
@@ -7,6 +15,9 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 
+import net.sourceforge.phpeclipse.phpunit.preferences.PHPUnitPreferencePage;
+import net.sourceforge.phpeclipse.phpunit.reporthandling.ConnectionListener;
+import net.sourceforge.phpeclipse.phpunit.reporthandling.XMLReportHandler;
 import net.sourceforge.phpeclipse.phpunit.testpool.TestCase;
 import net.sourceforge.phpeclipse.phpunit.testpool.TestPool;
 import net.sourceforge.phpeclipse.phpunit.testpool.TestSuite;
@@ -20,28 +31,7 @@ import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.part.ViewPart;
 
-/**
- * @author Ali Echihabi
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-/*
- * Created on May 22, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
 
-/**
- * @author Ali Echihabi (ali_echihabi@ieee.org)
- *
- * Plugin for PHP unit Testing.
- * www.phpeclipse.de
- * 
- * This the main view showing the progress and reports.
- * 
- */
 
 public class PHPUnitView extends ViewPart {
 
@@ -69,8 +59,11 @@ public class PHPUnitView extends ViewPart {
        private ResultsInfoComposite resultsInfoComposite;
        //private SettingsInfoComposite settingsInfoComposite; //TODO: move somewhere else, launcher, wizard or preferences.
        private FileDialog dialog;
+       private String testSuiteToRun;
+
 
-       private String testSuiteToRun = "";
+       private Action selectTestAction;
+       private Action startTestAction;
 
 
        public PHPUnitView() {
@@ -176,14 +169,16 @@ public class PHPUnitView extends ViewPart {
        }
 
        private void setActions() {
+               
                final IActionBars actionBars = getViewSite().getActionBars();
                IToolBarManager toolBarManager = actionBars.getToolBarManager();
 
-               Action selectTestAction = new Action() {
+               selectTestAction = new Action() {
                        
                        public void run() {
-                               
-                               testSuiteToRun = dialog.open(); 
+                                               
+                               testSuiteToRun = dialog.open();
+                               startTestAction.setEnabled(true);       
                        }
                };
                
@@ -195,7 +190,7 @@ public class PHPUnitView extends ViewPart {
                toolBarManager.add(selectTestAction);
                
                
-               Action startTestAction = new Action() {
+               startTestAction = new Action() {
                
                        public void run() {
                                
@@ -205,8 +200,10 @@ public class PHPUnitView extends ViewPart {
                                                return;
                                                
                                        startTests(testSuiteToRun);
+                                       //setEnabled(false);
+                                       
                                } catch (IOException e) {
-                                       // TODO Auto-generated catch block
+                                       
                                        e.printStackTrace();
                                }
                                        
@@ -215,9 +212,9 @@ public class PHPUnitView extends ViewPart {
                };
                
                startTestAction.setText("Start Test");
-               startTestAction.setToolTipText("Start Test Suite");
+               startTestAction.setToolTipText("Start Test Suite. Select a Test Suite first.");
                startTestAction.setImageDescriptor(PHPUnitImages.DESC_RUN_TEST_SUITE);
- 
+               startTestAction.setEnabled(false);
        
                toolBarManager.add(startTestAction);
        }
@@ -278,9 +275,11 @@ public class PHPUnitView extends ViewPart {
 
                out.write("<?php" + "\n");
                out.write("ob_start();" + "\n");
+                               
+               String path = PHPUnitPlugin.getDefault().getPreferenceStore().getString(PHPUnitPreferencePage.PHPUNIT_PATH);
+
                
-               //TODO: use install dir for path to phpunit. include it with plugin.
-               out.write("$path = \"C:/Documents and Settings/Ali Echihabi/My Documents/workspace.eclipse2.1/PHPUnit/phpunit\";" + "\n");
+               out.write("$path = \"" + path + "\";" + "\n");
                
                out.write("include_once($path . \"/phpunit_test.php\");" + "\n");
                out.write("include_once $path . \"/socketTestResult.php\";" + "\n");