From 5614731e4897a0be59dbe822a5b3bff348ae27fe Mon Sep 17 00:00:00 2001 From: khartlage Date: Sat, 8 Feb 2003 11:54:39 +0000 Subject: [PATCH] Switched to Eclipse 2.1 development --- .../net/sourceforge/phpdt/tidy/JtidyPlugin.java | 8 ++-- .../phpdt/tidy/actions/AbstractJTidyAction.java | 2 +- .../tidy/actions/AbstractJTidyEditorAction.java | 1 - .../phpdt/tidy/actions/FormatWithJTidyAction.java | 1 + .../tidy/actions/FormatWithJTidyEditorAction.java | 1 + .../phpdt/tidy/actions/ParseWithJTidyAction.java | 1 + .../tidy/actions/ParseWithJTidyEditorAction.java | 1 + .../tidy/preferences/JTidyGeneralPreferences.java | 1 + .../tidy/preferences/JTidyNewTagsPreferences.java | 1 + .../preferences/JTidyOutputLookPreferences.java | 1 + .../tidy/preferences/JTidyOutputPreferences.java | 1 + .../phpdt/tidy/preferences/JTidyPreferences.java | 1 + .../preferences/JTidyWrapIndentPreferences.java | 1 + .../sourceforge/phpdt/tidy/w3c/DOMNodeImpl.java | 1 - .../src/net/sourceforge/phpdt/tidy/w3c/Lexer.java | 1 - .../src/net/sourceforge/phpdt/tidy/w3c/Node.java | 1 - .../src/net/sourceforge/phpdt/tidy/w3c/Report.java | 1 + net.sourceforge.phpeclipse.debug.core/.classpath | 35 +++++++++++--- net.sourceforge.phpeclipse.debug.core/plugin.xml | 1 + net.sourceforge.phpeclipse.debug.ui/.classpath | 47 +++++++++++++++----- net.sourceforge.phpeclipse.debug.ui/.project | 1 - .../phpdt/debug/ui/PHPDebugUiImages.java | 3 +- .../phpdt/internal/debug/ui/PHPDebugUiPlugin.java | 3 +- .../phpdt/internal/debug/ui/PHPSourceLocator.java | 3 +- .../ui/launcher/LoadPathEntryLabelProvider.java | 3 +- .../debug/ui/launcher/PHPArgumentsTab.java | 13 +++--- .../debug/ui/launcher/PHPEntryPointTab.java | 11 +++-- .../debug/ui/launcher/PHPEnvironmentTab.java | 1 + .../debug/ui/launcher/PHPLaunchShortcut.java | 9 ++-- .../ui/preferences/EditInterpreterDialog.java | 9 ++-- .../ui/preferences/PHPBasePreferencePage.java | 3 +- .../preferences/PHPInterpreterContentProvider.java | 1 - .../preferences/PHPInterpreterLabelProvider.java | 3 +- .../preferences/PHPInterpreterPreferencePage.java | 7 ++- net.sourceforge.phpeclipse.launching/.classpath | 47 ++++++++++++++----- .../internal/launching/InterpreterRunner.java | 3 - .../launching/InterpreterRunnerConfiguration.java | 1 + .../phpdt/internal/launching/PHPInterpreter.java | 1 - .../launching/PHPLaunchConfigurationDelegate.java | 2 - .../internal/launching/PHPLaunchingPlugin.java | 1 + .../phpdt/internal/launching/PHPRuntime.java | 1 + net.sourceforge.phpeclipse.phphelp/.classpath | 31 +++++++++---- .../phpeclipse/actions/PHPStartApacheAction.java | 9 +--- 43 files changed, 178 insertions(+), 96 deletions(-) diff --git a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/JtidyPlugin.java b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/JtidyPlugin.java index ce0d272..cf100dc 100644 --- a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/JtidyPlugin.java +++ b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/JtidyPlugin.java @@ -4,6 +4,10 @@ import java.io.File; import java.util.MissingResourceException; import java.util.ResourceBundle; +import net.sourceforge.phpdt.tidy.preferences.IPreferenceConstants; +import net.sourceforge.phpdt.tidy.w3c.Configuration; +import net.sourceforge.phpdt.tidy.w3c.Tidy; + import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; @@ -12,10 +16,6 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.ui.plugin.AbstractUIPlugin; -import net.sourceforge.phpdt.tidy.w3c.Configuration; -import net.sourceforge.phpdt.tidy.w3c.Tidy; - -import net.sourceforge.phpdt.tidy.preferences.IPreferenceConstants; /** * The main plugin class to be used in the desktop. diff --git a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/AbstractJTidyAction.java b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/AbstractJTidyAction.java index 8ca2cae..d54ee89 100644 --- a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/AbstractJTidyAction.java +++ b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/AbstractJTidyAction.java @@ -9,6 +9,7 @@ import java.io.InputStream; import java.util.Iterator; import net.sourceforge.phpdt.tidy.JtidyPlugin; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; @@ -18,7 +19,6 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.editors.text.TextEditor; import org.eclipse.ui.texteditor.ITextEditor; diff --git a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/AbstractJTidyEditorAction.java b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/AbstractJTidyEditorAction.java index f6dd3fd..619181c 100644 --- a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/AbstractJTidyEditorAction.java +++ b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/AbstractJTidyEditorAction.java @@ -5,7 +5,6 @@ package net.sourceforge.phpdt.tidy.actions; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorActionDelegate; import org.eclipse.ui.IEditorPart; diff --git a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/FormatWithJTidyAction.java b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/FormatWithJTidyAction.java index 2b4e6e0..2e1a222 100644 --- a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/FormatWithJTidyAction.java +++ b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/FormatWithJTidyAction.java @@ -1,6 +1,7 @@ package net.sourceforge.phpdt.tidy.actions; import net.sourceforge.phpdt.tidy.JTidyConsole; + import org.eclipse.jface.action.IAction; public class FormatWithJTidyAction extends AbstractJTidyObjectAction { diff --git a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/FormatWithJTidyEditorAction.java b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/FormatWithJTidyEditorAction.java index 6c1a25f..8753b85 100644 --- a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/FormatWithJTidyEditorAction.java +++ b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/FormatWithJTidyEditorAction.java @@ -4,6 +4,7 @@ package net.sourceforge.phpdt.tidy.actions; import net.sourceforge.phpdt.tidy.JTidyConsole; + import org.eclipse.jface.action.IAction; /** diff --git a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/ParseWithJTidyAction.java b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/ParseWithJTidyAction.java index 96b4acb..390a2fb 100644 --- a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/ParseWithJTidyAction.java +++ b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/ParseWithJTidyAction.java @@ -1,6 +1,7 @@ package net.sourceforge.phpdt.tidy.actions; import net.sourceforge.phpdt.tidy.JTidyConsole; + import org.eclipse.jface.action.IAction; public class ParseWithJTidyAction extends AbstractJTidyObjectAction { diff --git a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/ParseWithJTidyEditorAction.java b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/ParseWithJTidyEditorAction.java index 5538e73..1a014ed 100644 --- a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/ParseWithJTidyEditorAction.java +++ b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/actions/ParseWithJTidyEditorAction.java @@ -4,6 +4,7 @@ package net.sourceforge.phpdt.tidy.actions; import net.sourceforge.phpdt.tidy.JTidyConsole; + import org.eclipse.jface.action.IAction; /** diff --git a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyGeneralPreferences.java b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyGeneralPreferences.java index cfb01ec..cf6ac43 100644 --- a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyGeneralPreferences.java +++ b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyGeneralPreferences.java @@ -1,6 +1,7 @@ package net.sourceforge.phpdt.tidy.preferences; import net.sourceforge.phpdt.tidy.JtidyPlugin; + import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.FileFieldEditor; diff --git a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyNewTagsPreferences.java b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyNewTagsPreferences.java index ea5c9ae..7f48598 100644 --- a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyNewTagsPreferences.java +++ b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyNewTagsPreferences.java @@ -1,6 +1,7 @@ package net.sourceforge.phpdt.tidy.preferences; import net.sourceforge.phpdt.tidy.JtidyPlugin; + import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.StringFieldEditor; diff --git a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyOutputLookPreferences.java b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyOutputLookPreferences.java index 07580b0..2968790 100644 --- a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyOutputLookPreferences.java +++ b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyOutputLookPreferences.java @@ -1,6 +1,7 @@ package net.sourceforge.phpdt.tidy.preferences; import net.sourceforge.phpdt.tidy.JtidyPlugin; + import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.IPreferenceStore; diff --git a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyOutputPreferences.java b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyOutputPreferences.java index 16fe26e..0690496 100644 --- a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyOutputPreferences.java +++ b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyOutputPreferences.java @@ -1,6 +1,7 @@ package net.sourceforge.phpdt.tidy.preferences; import net.sourceforge.phpdt.tidy.JtidyPlugin; + import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.IPreferenceStore; diff --git a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyPreferences.java b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyPreferences.java index 260111c..254bf73 100644 --- a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyPreferences.java +++ b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyPreferences.java @@ -1,6 +1,7 @@ package net.sourceforge.phpdt.tidy.preferences; import net.sourceforge.phpdt.tidy.JtidyPlugin; + import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.IPreferenceStore; diff --git a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyWrapIndentPreferences.java b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyWrapIndentPreferences.java index 256ce52..8f42d5b 100644 --- a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyWrapIndentPreferences.java +++ b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/preferences/JTidyWrapIndentPreferences.java @@ -1,6 +1,7 @@ package net.sourceforge.phpdt.tidy.preferences; import net.sourceforge.phpdt.tidy.JtidyPlugin; + import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.IPreferenceStore; diff --git a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/w3c/DOMNodeImpl.java b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/w3c/DOMNodeImpl.java index 29c044d..2f813da 100644 --- a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/w3c/DOMNodeImpl.java +++ b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/w3c/DOMNodeImpl.java @@ -6,7 +6,6 @@ package net.sourceforge.phpdt.tidy.w3c; import org.w3c.dom.DOMException; -import sun.security.krb5.internal.n; /** * diff --git a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/w3c/Lexer.java b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/w3c/Lexer.java index 1b14645..9c8b791 100644 --- a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/w3c/Lexer.java +++ b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/w3c/Lexer.java @@ -60,7 +60,6 @@ import java.util.Stack; import java.util.Vector; import org.eclipse.core.resources.IFile; -import sun.security.krb5.internal.av; public class Lexer { diff --git a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/w3c/Node.java b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/w3c/Node.java index e6926b9..fca5789 100644 --- a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/w3c/Node.java +++ b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/w3c/Node.java @@ -5,7 +5,6 @@ package net.sourceforge.phpdt.tidy.w3c; -import sun.security.krb5.internal.n; /** * diff --git a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/w3c/Report.java b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/w3c/Report.java index 2d30d39..4e5e140 100644 --- a/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/w3c/Report.java +++ b/archive/net.sourceforge.phpeclipse.jtidy/src/net/sourceforge/phpdt/tidy/w3c/Report.java @@ -41,6 +41,7 @@ import java.util.ResourceBundle; import net.sourceforge.phpdt.tidy.JTidyConsole; import net.sourceforge.phpdt.tidy.JtidyPlugin; + import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; import org.eclipse.ui.texteditor.MarkerUtilities; diff --git a/net.sourceforge.phpeclipse.debug.core/.classpath b/net.sourceforge.phpeclipse.debug.core/.classpath index 8f1260d..e71a810 100644 --- a/net.sourceforge.phpeclipse.debug.core/.classpath +++ b/net.sourceforge.phpeclipse.debug.core/.classpath @@ -2,19 +2,38 @@ + path="ECLIPSE_HOME/plugins/org.eclipse.ui_2.1.0/ui.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_2.1.0/uisrc.zip"/> + path="ECLIPSE_HOME/plugins/org.eclipse.swt.win32_2.1.0/ws/win32/swt.jar" sourcepath="ORG_ECLIPSE_PLATFORM_WIN32_SOURCE_SRC/org.eclipse.swt.win32_2.1.0/ws/win32/swtsrc.zip"/> + path="ECLIPSE_HOME/plugins/org.eclipse.text_2.1.0/text.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.text_2.1.0/textsrc.zip"/> + path="ECLIPSE_HOME/plugins/org.eclipse.jface_2.1.0/jface.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_2.1.0/jfacesrc.zip"/> + path="ECLIPSE_HOME/plugins/org.eclipse.jface.text_2.1.0/jfacetext.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface.text_2.1.0/jfacetextsrc.zip"/> - + path="ECLIPSE_HOME/plugins/org.eclipse.ui.views_2.1.0/views.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.views_2.1.0/viewssrc.zip"/> + + + + + + + + + - + + diff --git a/net.sourceforge.phpeclipse.debug.core/plugin.xml b/net.sourceforge.phpeclipse.debug.core/plugin.xml index 13039ed..a955c33 100644 --- a/net.sourceforge.phpeclipse.debug.core/plugin.xml +++ b/net.sourceforge.phpeclipse.debug.core/plugin.xml @@ -12,6 +12,7 @@ + diff --git a/net.sourceforge.phpeclipse.debug.ui/.classpath b/net.sourceforge.phpeclipse.debug.ui/.classpath index 2f2dae7..bc6db00 100644 --- a/net.sourceforge.phpeclipse.debug.ui/.classpath +++ b/net.sourceforge.phpeclipse.debug.ui/.classpath @@ -1,17 +1,40 @@ - - - - - - - - - - + + + + + + + + + + + + + + + - + + + + diff --git a/net.sourceforge.phpeclipse.debug.ui/.project b/net.sourceforge.phpeclipse.debug.ui/.project index ad08fc7..5cfad78 100644 --- a/net.sourceforge.phpeclipse.debug.ui/.project +++ b/net.sourceforge.phpeclipse.debug.ui/.project @@ -4,7 +4,6 @@ net.sourceforge.phpeclipse - net.sourceforge.phpeclipse.debug.core net.sourceforge.phpeclipse.launching diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/debug/ui/PHPDebugUiImages.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/debug/ui/PHPDebugUiImages.java index 787fe19..e447ff7 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/debug/ui/PHPDebugUiImages.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/debug/ui/PHPDebugUiImages.java @@ -3,11 +3,12 @@ package net.sourceforge.phpdt.debug.ui; import java.net.MalformedURLException; import java.net.URL; +import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin; + import org.eclipse.jface.action.IAction; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.swt.graphics.Image; -import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin; public class PHPDebugUiImages { diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java index 971388a..45c07c3 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java @@ -1,15 +1,14 @@ package net.sourceforge.phpdt.internal.debug.ui; import net.sourceforge.phpeclipse.PHPeclipsePlugin; + import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.runtime.IPluginDescriptor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.plugin.AbstractUIPlugin; -import net.sourceforge.phpdt.debug.ui.PHPDebugUiConstants; public class PHPDebugUiPlugin extends AbstractUIPlugin { public static final String PLUGIN_ID = "net.sourceforge.phpeclipse.debug.ui"; //$NON-NLS-1$ diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPSourceLocator.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPSourceLocator.java index c4e4e3f..fd31b85 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPSourceLocator.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPSourceLocator.java @@ -1,6 +1,8 @@ package net.sourceforge.phpdt.internal.debug.ui; +import net.sourceforge.phpdt.internal.launching.PHPLaunchConfigurationAttribute; import net.sourceforge.phpeclipse.PHPeclipsePlugin; + import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; @@ -12,7 +14,6 @@ import org.eclipse.debug.ui.ISourcePresentation; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; -import net.sourceforge.phpdt.internal.launching.PHPLaunchConfigurationAttribute; public class PHPSourceLocator implements IPersistableSourceLocator, ISourcePresentation { private String absoluteWorkingDirectory; diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/LoadPathEntryLabelProvider.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/LoadPathEntryLabelProvider.java index 6591de8..647329c 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/LoadPathEntryLabelProvider.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/LoadPathEntryLabelProvider.java @@ -1,10 +1,11 @@ package net.sourceforge.phpdt.internal.debug.ui.launcher; +import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin; import net.sourceforge.phpeclipse.LoadPathEntry; + import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.swt.graphics.Image; -import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin; /** * @author xp4 diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPArgumentsTab.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPArgumentsTab.java index e45fdb1..c0aca3a 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPArgumentsTab.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPArgumentsTab.java @@ -1,5 +1,12 @@ package net.sourceforge.phpdt.internal.debug.ui.launcher; +import net.sourceforge.phpdt.debug.ui.PHPDebugUiConstants; +import net.sourceforge.phpdt.debug.ui.PHPDebugUiImages; +import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages; +import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin; +import net.sourceforge.phpdt.internal.launching.PHPLaunchConfigurationAttribute; +import net.sourceforge.phpdt.internal.ui.util.DirectorySelector; + import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; @@ -16,12 +23,6 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import net.sourceforge.phpdt.debug.ui.PHPDebugUiConstants; -import net.sourceforge.phpdt.debug.ui.PHPDebugUiImages; -import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages; -import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin; -import net.sourceforge.phpdt.internal.launching.PHPLaunchConfigurationAttribute; -import net.sourceforge.phpdt.internal.ui.util.DirectorySelector; public class PHPArgumentsTab extends AbstractLaunchConfigurationTab { protected Text interpreterArgsText, programArgsText; diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEntryPointTab.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEntryPointTab.java index 4f3ebf7..4bea896 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEntryPointTab.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEntryPointTab.java @@ -1,6 +1,12 @@ package net.sourceforge.phpdt.internal.debug.ui.launcher; +import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages; +import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin; +import net.sourceforge.phpdt.internal.launching.PHPLaunchConfigurationAttribute; import net.sourceforge.phpdt.internal.ui.PHPUiImages; +import net.sourceforge.phpdt.internal.ui.util.PHPFileSelector; +import net.sourceforge.phpdt.internal.ui.util.PHPProjectSelector; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -22,11 +28,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPage; -import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages; -import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin; -import net.sourceforge.phpdt.internal.launching.PHPLaunchConfigurationAttribute; -import net.sourceforge.phpdt.internal.ui.util.PHPFileSelector; -import net.sourceforge.phpdt.internal.ui.util.PHPProjectSelector; public class PHPEntryPointTab extends AbstractLaunchConfigurationTab { protected String originalFileName, originalProjectName; diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java index 13c8630..863d51f 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java @@ -14,6 +14,7 @@ import net.sourceforge.phpdt.internal.ui.PHPUiImages; import net.sourceforge.phpeclipse.LoadPathEntry; import net.sourceforge.phpeclipse.PHPCore; import net.sourceforge.phpeclipse.resourcesview.PHPProject; + import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPLaunchShortcut.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPLaunchShortcut.java index c33a7d0..3fbd8e2 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPLaunchShortcut.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPLaunchShortcut.java @@ -3,6 +3,11 @@ package net.sourceforge.phpdt.internal.debug.ui.launcher; import java.util.ArrayList; import java.util.List; +import net.sourceforge.phpdt.debug.ui.PHPDebugUiConstants; +import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages; +import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin; +import net.sourceforge.phpdt.internal.launching.PHPLaunchConfigurationAttribute; + import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Status; @@ -17,10 +22,6 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; -import net.sourceforge.phpdt.debug.ui.PHPDebugUiConstants; -import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages; -import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin; -import net.sourceforge.phpdt.internal.launching.PHPLaunchConfigurationAttribute; public class PHPLaunchShortcut implements ILaunchShortcut { public PHPLaunchShortcut() { diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/EditInterpreterDialog.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/EditInterpreterDialog.java index c0f6d45..d151393 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/EditInterpreterDialog.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/EditInterpreterDialog.java @@ -2,6 +2,11 @@ package net.sourceforge.phpdt.internal.debug.ui.preferences; import java.io.File; +import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages; +import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin; +import net.sourceforge.phpdt.internal.launching.PHPInterpreter; +import net.sourceforge.phpdt.internal.ui.dialog.StatusDialog; + import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; @@ -22,10 +27,6 @@ import org.eclipse.swt.widgets.DirectoryDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages; -import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin; -import net.sourceforge.phpdt.internal.launching.PHPInterpreter; -import net.sourceforge.phpdt.internal.ui.dialog.StatusDialog; public class EditInterpreterDialog extends StatusDialog { protected PHPInterpreter interpreterToEdit; diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/PHPBasePreferencePage.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/PHPBasePreferencePage.java index 9126e66..b7ecbcc 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/PHPBasePreferencePage.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/PHPBasePreferencePage.java @@ -1,5 +1,7 @@ package net.sourceforge.phpdt.internal.debug.ui.preferences; +import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages; + import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridLayout; @@ -8,7 +10,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages; public class PHPBasePreferencePage extends PreferencePage implements IWorkbenchPreferencePage { diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/PHPInterpreterContentProvider.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/PHPInterpreterContentProvider.java index f5a5aef..329d7ac 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/PHPInterpreterContentProvider.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/PHPInterpreterContentProvider.java @@ -4,7 +4,6 @@ import java.util.List; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.Viewer; -import net.sourceforge.phpdt.internal.launching.PHPInterpreter; public class PHPInterpreterContentProvider implements IStructuredContentProvider { protected List interpreters; diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/PHPInterpreterLabelProvider.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/PHPInterpreterLabelProvider.java index e94f498..83131e7 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/PHPInterpreterLabelProvider.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/PHPInterpreterLabelProvider.java @@ -1,10 +1,11 @@ package net.sourceforge.phpdt.internal.debug.ui.preferences; +import net.sourceforge.phpdt.internal.launching.PHPInterpreter; + import org.eclipse.core.runtime.IPath; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.swt.graphics.Image; -import net.sourceforge.phpdt.internal.launching.PHPInterpreter; public class PHPInterpreterLabelProvider implements ITableLabelProvider { diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/PHPInterpreterPreferencePage.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/PHPInterpreterPreferencePage.java index 3997682..3cfe475 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/PHPInterpreterPreferencePage.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/PHPInterpreterPreferencePage.java @@ -3,6 +3,10 @@ package net.sourceforge.phpdt.internal.debug.ui.preferences; import java.util.ArrayList; import java.util.List; +import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages; +import net.sourceforge.phpdt.internal.launching.PHPInterpreter; +import net.sourceforge.phpdt.internal.launching.PHPRuntime; + import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jface.viewers.CheckStateChangedEvent; import org.eclipse.jface.viewers.CheckboxTableViewer; @@ -25,9 +29,6 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages; -import net.sourceforge.phpdt.internal.launching.PHPInterpreter; -import net.sourceforge.phpdt.internal.launching.PHPRuntime; public class PHPInterpreterPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { protected CheckboxTableViewer tableViewer; diff --git a/net.sourceforge.phpeclipse.launching/.classpath b/net.sourceforge.phpeclipse.launching/.classpath index 40e8710..9e4e573 100644 --- a/net.sourceforge.phpeclipse.launching/.classpath +++ b/net.sourceforge.phpeclipse.launching/.classpath @@ -1,18 +1,39 @@ - - + + + + + + + + + + + + + + + + + + + - - - - - - - - diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunner.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunner.java index 5e76ed5..81aebb9 100644 --- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunner.java +++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunner.java @@ -2,11 +2,8 @@ package net.sourceforge.phpdt.internal.launching; import java.io.File; import java.io.IOException; -import java.util.Iterator; -import net.sourceforge.phpeclipse.resourcesview.PHPProject; import org.eclipse.core.boot.BootLoader; -import org.eclipse.core.resources.IProject; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.model.IProcess; diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunnerConfiguration.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunnerConfiguration.java index 5af6d02..d2b5300 100644 --- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunnerConfiguration.java +++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunnerConfiguration.java @@ -3,6 +3,7 @@ package net.sourceforge.phpdt.internal.launching; import java.io.File; import net.sourceforge.phpeclipse.resourcesview.PHPProject; + import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPInterpreter.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPInterpreter.java index 2e342b9..63accc2 100644 --- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPInterpreter.java +++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPInterpreter.java @@ -3,7 +3,6 @@ package net.sourceforge.phpdt.internal.launching; import java.io.File; import java.io.IOException; -import org.eclipse.core.internal.resources.OS; import org.eclipse.core.runtime.IPath; public class PHPInterpreter { diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchConfigurationDelegate.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchConfigurationDelegate.java index bbc6a9e..618212e 100644 --- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchConfigurationDelegate.java +++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchConfigurationDelegate.java @@ -1,7 +1,5 @@ package net.sourceforge.phpdt.internal.launching; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchingPlugin.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchingPlugin.java index dee7aa5..f5f6f10 100644 --- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchingPlugin.java +++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchingPlugin.java @@ -1,6 +1,7 @@ package net.sourceforge.phpdt.internal.launching; import net.sourceforge.phpeclipse.PHPeclipsePlugin; + import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.runtime.IPluginDescriptor; import org.eclipse.core.runtime.IStatus; diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPRuntime.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPRuntime.java index 03447e1..dd1827c 100644 --- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPRuntime.java +++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPRuntime.java @@ -16,6 +16,7 @@ import java.util.Iterator; import java.util.List; import javax.xml.parsers.SAXParserFactory; + import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.xml.sax.Attributes; diff --git a/net.sourceforge.phpeclipse.phphelp/.classpath b/net.sourceforge.phpeclipse.phphelp/.classpath index 8a77a77..6696591 100644 --- a/net.sourceforge.phpeclipse.phphelp/.classpath +++ b/net.sourceforge.phpeclipse.phphelp/.classpath @@ -2,21 +2,34 @@ + path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_2.1.0/resources.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_2.1.0/resourcessrc.zip"/> + path="ECLIPSE_HOME/plugins/org.eclipse.ui_2.1.0/ui.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_2.1.0/uisrc.zip"/> + path="ECLIPSE_HOME/plugins/org.eclipse.swt.win32_2.1.0/ws/win32/swt.jar" sourcepath="ORG_ECLIPSE_PLATFORM_WIN32_SOURCE_SRC/org.eclipse.swt.win32_2.1.0/ws/win32/swtsrc.zip"/> + path="ECLIPSE_HOME/plugins/org.eclipse.text_2.1.0/text.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.text_2.1.0/textsrc.zip"/> + path="ECLIPSE_HOME/plugins/org.eclipse.jface_2.1.0/jface.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_2.1.0/jfacesrc.zip"/> + path="ECLIPSE_HOME/plugins/org.eclipse.jface.text_2.1.0/jfacetext.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface.text_2.1.0/jfacetextsrc.zip"/> - - + path="ECLIPSE_HOME/plugins/org.eclipse.ui.views_2.1.0/views.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.views_2.1.0/viewssrc.zip"/> + + + + + + + + diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartApacheAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartApacheAction.java index 2928345..b1f00bd 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartApacheAction.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartApacheAction.java @@ -11,25 +11,18 @@ Contributors: **********************************************************************/ package net.sourceforge.phpeclipse.actions; -import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import java.text.MessageFormat; import net.sourceforge.phpeclipse.PHPeclipsePlugin; import net.sourceforge.phpeclipse.views.PHPConsole; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; + import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; public class PHPStartApacheAction implements IWorkbenchWindowActionDelegate { protected IWorkbenchWindow activeWindow = null; -- 1.7.1