From: shleh <shleh>
Date: Tue, 21 Sep 2004 02:14:55 +0000 (+0000)
Subject: moving report handling related classes to own package + other minor changes.
X-Git-Url: http://git.phpeclipse.com
moving report handling related classes to own package + other minor changes.
---
diff --git a/net.sourceforge.phpeclipse.phpunit/.classpath b/net.sourceforge.phpeclipse.phpunit/.classpath
index 26a1867..919c750 100644
--- a/net.sourceforge.phpeclipse.phpunit/.classpath
+++ b/net.sourceforge.phpeclipse.phpunit/.classpath
@@ -6,7 +6,6 @@
<classpathentry kind="src" path="/org.eclipse.core.boot"/>
<classpathentry kind="src" path="/org.eclipse.core.runtime"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="C:/Documents and Settings/Ali Echihabi/My Documents/eclipse/eclipse-SDK-3_1.0-win32/eclipse/plugins/org.junit_3.8.1/junit.jar"/>
<classpathentry kind="src" path="/org.eclipse.core.resources"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/net.sourceforge.phpeclipse.phpunit/plugin.xml b/net.sourceforge.phpeclipse.phpunit/plugin.xml
index efe47a2..2ea8e3f 100644
--- a/net.sourceforge.phpeclipse.phpunit/plugin.xml
+++ b/net.sourceforge.phpeclipse.phpunit/plugin.xml
@@ -30,20 +30,6 @@
</view>
</extension>
<extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- adaptable="true"
- nameFilter="*.php"
- id="net.sourceforge.phpeclipse.phpunit.actions.runTestsAction">
- <action
- label="Run PHPUnit Tests"
- class="net.sourceforge.phpeclipse.phpunit.actions.RunTestsAction"
- id="net.sourceforge.phpeclipse.phpunit.action1">
- </action>
- </objectContribution>
- </extension>
- <extension
point="org.eclipse.ui.preferencePages">
<page
name="PHPUnit Preference"
diff --git a/net.sourceforge.phpeclipse.phpunit/src/Messages.java b/net.sourceforge.phpeclipse.phpunit/src/Messages.java
deleted file mode 100644
index d716c94..0000000
--- a/net.sourceforge.phpeclipse.phpunit/src/Messages.java
+++ /dev/null
@@ -1,43 +0,0 @@
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/*
- * Created on Jul 28, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-
-/**
- * @author Ali Echihabi
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class Messages {
-
- private static final String BUNDLE_NAME = "net.sourceforge.phpeclipse.phpunit.test"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE =
- ResourceBundle.getBundle(BUNDLE_NAME);
-
- /**
- *
- */
- private Messages() {
-
- // TODO Auto-generated constructor stub
- }
- /**
- * @param key
- * @return
- */
- public static String getString(String key) {
- // TODO Auto-generated method stub
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitImages.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitImages.java
index 69e9756..f5126d3 100644
--- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitImages.java
+++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitImages.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;
import java.net.MalformedURLException;
@@ -7,6 +15,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.swt.graphics.Image;
+
public class PHPUnitImages {
protected static final String NAME_PREFIX =
@@ -34,31 +43,42 @@ public class PHPUnitImages {
* Available cached Images in the Java plugin image registry.
*/
- public static final String IMG_SELECT_TEST_SUITE = NAME_PREFIX + "tsuite.gif";
+ public static final String IMG_SELECT_TEST_SUITE =
+ NAME_PREFIX + "tsuite.gif";
public static final String IMG_RUN_TEST_SUITE = NAME_PREFIX + "start.gif";
public static final String IMG_TEST_ERROR = NAME_PREFIX + "testerr.gif";
public static final String IMG_TEST_FAILURE = NAME_PREFIX + "testfail.gif";
public static final String IMG_TEST_PASS = NAME_PREFIX + "testok.gif";
- public static final String IMG_TEST_SUITE_ERROR = NAME_PREFIX + "tsuiteerror.gif";
- public static final String IMG_TEST_SUITE_PASS = NAME_PREFIX + "tsuiteok.gif";
- public static final String IMG_TEST_SUITE_FAILURE = NAME_PREFIX + "tsuitefail.gif";
-
+ public static final String IMG_TEST_SUITE_ERROR =
+ NAME_PREFIX + "tsuiteerror.gif";
+ public static final String IMG_TEST_SUITE_PASS =
+ NAME_PREFIX + "tsuiteok.gif";
+ public static final String IMG_TEST_SUITE_FAILURE =
+ NAME_PREFIX + "tsuitefail.gif";
+
public static final String IMG_ERROR = NAME_PREFIX + "error.gif";
public static final String IMG_FAILURE = NAME_PREFIX + "failure.gif";
-
-
-
- public static final ImageDescriptor DESC_SELECT_TEST_SUITE = createManaged(IMG_SELECT_TEST_SUITE);
- public static final ImageDescriptor DESC_RUN_TEST_SUITE =createManaged(IMG_RUN_TEST_SUITE);
- public static final ImageDescriptor DESC_TEST_ERROR = createManaged(IMG_TEST_ERROR);
- public static final ImageDescriptor DESC_TEST_FAILURE = createManaged(IMG_TEST_FAILURE);
- public static final ImageDescriptor DESC_TEST_PASS = createManaged(IMG_TEST_PASS);
- public static final ImageDescriptor DESC_TEST_SUITE_ERROR = createManaged(IMG_TEST_SUITE_ERROR);
- public static final ImageDescriptor DESC_TEST_SUITE_PASS = createManaged(IMG_TEST_SUITE_PASS);
- public static final ImageDescriptor DESC_TEST_SUITE_FAILURE = createManaged(IMG_TEST_SUITE_FAILURE);
-
+
+ public static final ImageDescriptor DESC_SELECT_TEST_SUITE =
+ createManaged(IMG_SELECT_TEST_SUITE);
+ public static final ImageDescriptor DESC_RUN_TEST_SUITE =
+ createManaged(IMG_RUN_TEST_SUITE);
+ public static final ImageDescriptor DESC_TEST_ERROR =
+ createManaged(IMG_TEST_ERROR);
+ public static final ImageDescriptor DESC_TEST_FAILURE =
+ createManaged(IMG_TEST_FAILURE);
+ public static final ImageDescriptor DESC_TEST_PASS =
+ createManaged(IMG_TEST_PASS);
+ public static final ImageDescriptor DESC_TEST_SUITE_ERROR =
+ createManaged(IMG_TEST_SUITE_ERROR);
+ public static final ImageDescriptor DESC_TEST_SUITE_PASS =
+ createManaged(IMG_TEST_SUITE_PASS);
+ public static final ImageDescriptor DESC_TEST_SUITE_FAILURE =
+ createManaged(IMG_TEST_SUITE_FAILURE);
+
public static final ImageDescriptor DESC_ERROR = createManaged(IMG_ERROR);
- public static final ImageDescriptor DESC_FAILURE = createManaged(IMG_FAILURE);
+ public static final ImageDescriptor DESC_FAILURE =
+ createManaged(IMG_FAILURE);
/**
* Returns the image managed under the given key in this registry.
*
@@ -73,7 +93,6 @@ public class PHPUnitImages {
return IMAGE_REGISTRY;
}
- //---- Helper methods to access icons on the file system --------------------------------------
protected static ImageDescriptor createManaged(String name) {
try {
diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitPlugin.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitPlugin.java
index fb89999..e59bcab 100644
--- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitPlugin.java
+++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitPlugin.java
@@ -1,34 +1,26 @@
-/*
- * Created on Sep 4, 2004
+/*************************************************************************
+ * @author Ali Echihabi (ali_echihabi@ieee.org, ali.echihabi@souss.ca)
*
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package net.sourceforge.phpeclipse.phpunit;
+ * Plugin for PHP unit Testing.
+ * www.phpeclipse.de
+ *
+ *************************************************************************/
-import java.util.ResourceBundle;
+package net.sourceforge.phpeclipse.phpunit;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.plugin.AbstractUIPlugin;
-/**
- * @author Ali Echihabi
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class PHPUnitPlugin extends AbstractUIPlugin {
+public class PHPUnitPlugin extends AbstractUIPlugin {
private static PHPUnitPlugin plugin;
- private ResourceBundle resourceBundle;
public static final String PLUGIN_ID= "net.sourceforge.phpeclipse.phpunit"; //$NON-NLS-1$
/**
@@ -38,29 +30,8 @@ public class PHPUnitPlugin extends AbstractUIPlugin {
super(descriptor);
- System.out.println("desc: " + descriptor.getInstallURL());
-
-
plugin= this;
-
-
- String pathSuffix= "icons/"; //$NON-NLS-1$
-
- System.out.println("" + Platform.getLocation());
-
- System.out.println("" + Platform.getPluginStateLocation(plugin));
-
- System.out.println("" + Platform.getLogFileLocation());
-
-
-
-
-
-
- }
-
- public String getPath() {
- return plugin.getDescriptor().getInstallURL().getFile();
+
}
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 765b4a9..7ceff39 100644
--- 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;
@@ -8,6 +16,7 @@ import java.io.FileWriter;
import java.io.IOException;
import net.sourceforge.phpeclipse.phpunit.preferences.PHPUnitPreferencePage;
+import net.sourceforge.phpeclipse.phpunit.reporthandling.*;
import net.sourceforge.phpeclipse.phpunit.testpool.TestCase;
import net.sourceforge.phpeclipse.phpunit.testpool.TestPool;
import net.sourceforge.phpeclipse.phpunit.testpool.TestSuite;
@@ -21,28 +30,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 {
@@ -70,8 +58,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() {
@@ -177,14 +168,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);
}
};
@@ -196,7 +189,7 @@ public class PHPUnitView extends ViewPart {
toolBarManager.add(selectTestAction);
- Action startTestAction = new Action() {
+ startTestAction = new Action() {
public void run() {
@@ -206,8 +199,10 @@ public class PHPUnitView extends ViewPart {
return;
startTests(testSuiteToRun);
+ //setEnabled(false);
+
} catch (IOException e) {
- // TODO Auto-generated catch block
+
e.printStackTrace();
}
@@ -216,9 +211,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);
}
diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/ProgressInfoComposite.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/ProgressInfoComposite.java
index 2541c87..92e19dd 100644
--- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/ProgressInfoComposite.java
+++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/ProgressInfoComposite.java
@@ -1,15 +1,17 @@
-/*
- * Created on Jul 31, 2004
+/*************************************************************************
+ * @author Ali Echihabi (ali_echihabi@ieee.org, ali.echihabi@souss.ca)
*
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+ * Plugin for PHP unit Testing.
+ * www.phpeclipse.de
+ *
+ *************************************************************************/
+
+
package net.sourceforge.phpeclipse.phpunit;
import net.sourceforge.phpeclipse.phpunit.testpool.TestPool;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -17,12 +19,7 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.ProgressBar;
-/**
- * @author Ali Echihabi
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+
public class ProgressInfoComposite extends Composite {
diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/ResultsInfoComposite.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/ResultsInfoComposite.java
index 627da42..efaa99b 100644
--- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/ResultsInfoComposite.java
+++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/ResultsInfoComposite.java
@@ -1,9 +1,12 @@
-/*
- * Created on Jul 31, 2004
+/*************************************************************************
+ * @author Ali Echihabi (ali_echihabi@ieee.org, ali.echihabi@souss.ca)
*
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+ * Plugin for PHP unit Testing.
+ * www.phpeclipse.de
+ *
+ *************************************************************************/
+
+
package net.sourceforge.phpeclipse.phpunit;
import net.sourceforge.phpeclipse.phpunit.testpool.TestPool;
@@ -14,12 +17,7 @@ import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
-/**
- * @author Ali Echihabi
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+
public class ResultsInfoComposite extends Composite {
diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/SettingsInfoComposite.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/SettingsInfoComposite.java
index caf1d04..53539a0 100644
--- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/SettingsInfoComposite.java
+++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/SettingsInfoComposite.java
@@ -1,9 +1,12 @@
-/*
- * Created on Sep 11, 2004
+/*************************************************************************
+ * @author Ali Echihabi (ali_echihabi@ieee.org, ali.echihabi@souss.ca)
*
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+ * Plugin for PHP unit Testing.
+ * www.phpeclipse.de
+ *
+ *************************************************************************/
+
+
package net.sourceforge.phpeclipse.phpunit;
import org.eclipse.swt.SWT;
@@ -13,12 +16,8 @@ import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.FileDialog;
-/**
- * @author Ali Echihabi
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+
+
public class SettingsInfoComposite extends Composite {
FileDialog dialog;
diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/TestPoolContentProvider.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/TestPoolContentProvider.java
index 96489da..a255012 100644
--- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/TestPoolContentProvider.java
+++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/TestPoolContentProvider.java
@@ -1,9 +1,12 @@
-/*
- * Created on Aug 8, 2004
+/*************************************************************************
+ * @author Ali Echihabi (ali_echihabi@ieee.org, ali.echihabi@souss.ca)
*
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+ * Plugin for PHP unit Testing.
+ * www.phpeclipse.de
+ *
+ *************************************************************************/
+
+
package net.sourceforge.phpeclipse.phpunit;
import java.util.Vector;
@@ -13,12 +16,8 @@ import net.sourceforge.phpeclipse.phpunit.testpool.*;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
-/**
- * @author Ali Echihabi
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+
+
public class TestPoolContentProvider implements ITreeContentProvider {
diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/TestPoolLabelProvider.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/TestPoolLabelProvider.java
index 3e27112..1aec92c 100644
--- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/TestPoolLabelProvider.java
+++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/TestPoolLabelProvider.java
@@ -1,9 +1,12 @@
-/*
- * Created on Aug 8, 2004
+/*************************************************************************
+ * @author Ali Echihabi (ali_echihabi@ieee.org, ali.echihabi@souss.ca)
*
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+ * Plugin for PHP unit Testing.
+ * www.phpeclipse.de
+ *
+ *************************************************************************/
+
+
package net.sourceforge.phpeclipse.phpunit;
import net.sourceforge.phpeclipse.phpunit.testpool.TestCase;
@@ -12,13 +15,8 @@ import net.sourceforge.phpeclipse.phpunit.testpool.TestSuite;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Ali Echihabi
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+
+
public class TestPoolLabelProvider extends LabelProvider {
public String getText(Object element) {
diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/actions/RunTestsAction.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/actions/RunTestsAction.java
deleted file mode 100644
index 2e0a6eb..0000000
--- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/actions/RunTestsAction.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Created on Jun 10, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package net.sourceforge.phpeclipse.phpunit.actions;
-
-import java.io.IOException;
-
-import net.sourceforge.phpeclipse.phpunit.PHPUnitView;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.navigator.ResourceNavigator;
-
-/**
- * @author Ali Echihabi
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class RunTestsAction implements IObjectActionDelegate {
-
-
-
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
- */
- public void setActivePart(IAction action, IWorkbenchPart targetPart) {
- // TODO Auto-generated method stub
-
- System.out.println(targetPart.getTitle());
- ResourceNavigator nav = (ResourceNavigator)targetPart;
-
- Item selectedItem = nav.getViewer().getTree().getSelection()[0];
-
- Object d = selectedItem.getData();
-//
-// try {
-//
-// IFile data = (IFile) selectedItem.getData();
-//
-// }
-// catch(Exception e) {
-//
-// e.printStackTrace();
-//
-// }
-//
-
-
-
-// Shell shell = PHPUnitPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
-//
-// if(shell instanceof IStructuredSelection) {
-//
-// Object testObj = ((IStructuredSelection) )
-// }
-//
-
-
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
- */
- public void run(IAction action) {
-
- try {
- PHPUnitView.getDefault().startTests("");
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection) {
- // TODO Auto-generated method stub
-
- }
-
-}
diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/preferences/PHPUnitPreferencePage.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/preferences/PHPUnitPreferencePage.java
index f2d2a1d..63027fd 100644
--- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/preferences/PHPUnitPreferencePage.java
+++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/preferences/PHPUnitPreferencePage.java
@@ -1,3 +1,12 @@
+/*************************************************************************
+ * @author Ali Echihabi (ali_echihabi@ieee.org, ali.echihabi@souss.ca)
+ *
+ * Plugin for PHP unit Testing.
+ * www.phpeclipse.de
+ *
+ *************************************************************************/
+
+
package net.sourceforge.phpeclipse.phpunit.preferences;
import org.eclipse.jface.preference.*;
diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/ConnectionListener.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/reporthandling/ConnectionListener.java
similarity index 65%
rename from net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/ConnectionListener.java
rename to net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/reporthandling/ConnectionListener.java
index 30a711d..7e5b74f 100644
--- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/ConnectionListener.java
+++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/reporthandling/ConnectionListener.java
@@ -1,20 +1,21 @@
-/*
- * Created on Jul 24, 2004
+/*************************************************************************
+ * @author Ali Echihabi (ali_echihabi@ieee.org, ali.echihabi@souss.ca)
*
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package net.sourceforge.phpeclipse.phpunit;
+ * Plugin for PHP unit Testing.
+ * www.phpeclipse.de
+ *
+ *************************************************************************/
+
+
+
+package net.sourceforge.phpeclipse.phpunit.reporthandling;
import java.net.ServerSocket;
import java.net.Socket;
-/**
- * @author Ali Echihabi
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+import net.sourceforge.phpeclipse.phpunit.PHPUnitView;
+
+
public class ConnectionListener extends Thread {
private ServerSocket sSocket = null;
diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/ReportListener.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/reporthandling/ReportListener.java
similarity index 69%
rename from net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/ReportListener.java
rename to net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/reporthandling/ReportListener.java
index a26ec25..18238a5 100644
--- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/ReportListener.java
+++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/reporthandling/ReportListener.java
@@ -1,9 +1,21 @@
-package net.sourceforge.phpeclipse.phpunit;
+/*************************************************************************
+ * @author Ali Echihabi (ali_echihabi@ieee.org, ali.echihabi@souss.ca)
+ *
+ * Plugin for PHP unit Testing.
+ * www.phpeclipse.de
+ *
+ *************************************************************************/
+
+
+
+package net.sourceforge.phpeclipse.phpunit.reporthandling;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.net.Socket;
+import java.net.Socket;
+
+import net.sourceforge.phpeclipse.phpunit.PHPUnitView;
public class ReportListener extends Thread {
diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/XMLReportHandler.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/reporthandling/XMLReportHandler.java
similarity index 92%
rename from net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/XMLReportHandler.java
rename to net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/reporthandling/XMLReportHandler.java
index 69ab8e0..27ddbc3 100644
--- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/XMLReportHandler.java
+++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/reporthandling/XMLReportHandler.java
@@ -1,4 +1,13 @@
-package net.sourceforge.phpeclipse.phpunit;
+/*************************************************************************
+ * @author Ali Echihabi (ali_echihabi@ieee.org, ali.echihabi@souss.ca)
+ *
+ * Plugin for PHP unit Testing.
+ * www.phpeclipse.de
+ *
+ *************************************************************************/
+
+
+package net.sourceforge.phpeclipse.phpunit.reporthandling;
import java.io.File;
import java.io.FileInputStream;
@@ -11,6 +20,8 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import net.sourceforge.phpeclipse.phpunit.PHPUnitView;
+
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestCase.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestCase.java
index eba77d7..5f3a8ed 100644
--- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestCase.java
+++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestCase.java
@@ -1,18 +1,16 @@
-/*
- * Created on Jul 31, 2004
+/*************************************************************************
+ * @author Ali Echihabi (ali_echihabi@ieee.org, ali.echihabi@souss.ca)
*
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+ * Plugin for PHP unit Testing.
+ * www.phpeclipse.de
+ *
+ *************************************************************************/
+
+
package net.sourceforge.phpeclipse.phpunit.testpool;
-/**
- * @author Ali Echihabi
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+
public class TestCase {
public static final String PASS = "PASS";
diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestPool.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestPool.java
index 4ecdf4c..8e6a7fb 100644
--- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestPool.java
+++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestPool.java
@@ -1,20 +1,17 @@
-/*
- * Created on Jul 31, 2004
+/*************************************************************************
+ * @author Ali Echihabi (ali_echihabi@ieee.org, ali.echihabi@souss.ca)
*
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+ * Plugin for PHP unit Testing.
+ * www.phpeclipse.de
+ *
+ *************************************************************************/
+
+
package net.sourceforge.phpeclipse.phpunit.testpool;
import java.util.HashMap;
-
-/**
- * @author Ali Echihabi
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+
public class TestPool {
//private TestSuite currentParentTestSuite;
diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestSuite.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestSuite.java
index 3c4562c..90cea9e 100644
--- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestSuite.java
+++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestSuite.java
@@ -1,19 +1,17 @@
-/*
- * Created on Jul 31, 2004
+/*************************************************************************
+ * @author Ali Echihabi (ali_echihabi@ieee.org, ali.echihabi@souss.ca)
*
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+ * Plugin for PHP unit Testing.
+ * www.phpeclipse.de
+ *
+ *************************************************************************/
+
+
package net.sourceforge.phpeclipse.phpunit.testpool;
import java.util.Vector;
-/**
- * @author Ali Echihabi
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+
public class TestSuite {