Cleaner user interface

diff --git a/net.sourceforge.phpeclipse.externaltools/plugin.properties b/net.sourceforge.phpeclipse.externaltools/plugin.properties
index 8a927ca..3a9fe73 100644 (file)
--- a/net.sourceforge.phpeclipse.externaltools/plugin.properties
+++ b/net.sourceforge.phpeclipse.externaltools/plugin.properties
@@ -1,5 +1,6 @@
 LaunchConfigurationTypePHPApplication.name=PHP Application
 
+Program.externalTools=PHP Tools
 ExtPoint.configurationDuplicationMaps = Launch Configuration Duplication Maps
 ExtPoint.toolTypes = External Tool Types
 ExtPoint.argumentVariables  = Argument Variables
@@ -29,4 +30,3 @@ PreferencePage.externalToolsPreferences = PHP Launchers
 PreferencePage.antConsolePreferences = Console
 PreferencePage.antRuntimePreferences = Runtime
 
-Program.externalTools= PHP Program
\ No newline at end of file

diff --git a/net.sourceforge.phpeclipse.externaltools/plugin.xml b/net.sourceforge.phpeclipse.externaltools/plugin.xml
index 40c25a6..a32526d 100644 (file)
--- a/net.sourceforge.phpeclipse.externaltools/plugin.xml
+++ b/net.sourceforge.phpeclipse.externaltools/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.0"?>
 <plugin
    id="net.sourceforge.phpeclipse.externaltools"
-   name="ExternalTools Plug-in"
+   name="PHP ExternalTools Plug-in"
    version="1.1.6"
    provider-name="phpeclipse.de"
    class="net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin">
@@ -76,14 +76,14 @@
     <!-- Launch Configuration Extensions -->
     <extension point="org.eclipse.debug.core.launchConfigurationTypes">
        <launchConfigurationType
-               id = "net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType"
+               id = "net.sourceforge.phpeclipse.externaltools.ProgramLaunchConfigurationType"
                name = "%Program.externalTools"
                delegate = "net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramLaunchDelegate"
                modes = "run"
                category = "org.eclipse.ui.externaltools">
-       </launchConfigurationType>
+       </launchConfigurationType> 
        <launchConfigurationType
-               id = "net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType"
+               id = "net.sourceforge.phpeclipse.externaltools.ProgramBuilderLaunchConfigurationType"
                name = "%Program.externalTools"
                delegate = "net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramLaunchDelegate"
                modes = "run"
@@ -93,20 +93,20 @@
     
     <extension point = "net.sourceforge.phpeclipse.externaltools.configurationDuplicationMaps">
        <configurationMap
-               sourceType="net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType"
-               builderType="net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType">
+               sourceType="net.sourceforge.phpeclipse.externaltools.ProgramLaunchConfigurationType"
+               builderType="net.sourceforge.phpeclipse.externaltools.ProgramBuilderLaunchConfigurationType">
        </configurationMap>
     </extension>
     
     <extension point = "org.eclipse.debug.ui.launchConfigurationTabGroups">
                <launchConfigurationTabGroup
                        id="net.sourceforge.phpdt.externaltools.launchConfigurationTabGroup.program"
-                       type ="net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType"
+                       type ="net.sourceforge.phpeclipse.externaltools.ProgramLaunchConfigurationType"
                        class="net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramTabGroup">
                </launchConfigurationTabGroup>
                <launchConfigurationTabGroup
                        id="net.sourceforge.phpdt.externaltools.launchConfigurationTabGroup.program.builder"
-                       type ="net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType"
+                       type ="net.sourceforge.phpeclipse.externaltools.ProgramBuilderLaunchConfigurationType"
                        class="net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramBuilderTabGroup">
                </launchConfigurationTabGroup>
        </extension>
@@ -114,12 +114,12 @@
        <extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
                <launchConfigurationTypeImage
                        id="net.sourceforge.phpdt.externaltools.launchConfigurationTypeImage.program"
-                       configTypeID="net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType"
+                       configTypeID="net.sourceforge.phpeclipse.externaltools.ProgramLaunchConfigurationType"
                        icon="icons/full/obj16/external_tools.gif">
                </launchConfigurationTypeImage> 
                <launchConfigurationTypeImage
                        id="net.sourceforge.phpdt.externaltools.launchConfigurationTypeImage.program.builder"
-                       configTypeID="net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType"
+                       configTypeID="net.sourceforge.phpeclipse.externaltools.ProgramBuilderLaunchConfigurationType"
                        icon="icons/full/obj16/external_tools.gif">
                </launchConfigurationTypeImage> 
        </extension>

diff --git a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/model/IExternalToolConstants.java b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/model/IExternalToolConstants.java
index 3a00faa..43bb50a 100644 (file)
--- a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/model/IExternalToolConstants.java
+++ b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/model/IExternalToolConstants.java
@@ -242,13 +242,13 @@ public interface IExternalToolConstants {
        /**
         * Program launch configuration type identifier.
         */
-       public static final String ID_PROGRAM_LAUNCH_CONFIGURATION_TYPE = "net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType"; //$NON-NLS-1$
+       public static final String ID_PROGRAM_LAUNCH_CONFIGURATION_TYPE = PLUGIN_ID + ".ProgramLaunchConfigurationType"; //$NON-NLS-1$
        
        /**
         * Program builder launch configuration type identifier. Program project
         * builders are of this type.
         */
-       public static final String ID_PROGRAM_BUILDER_LAUNCH_CONFIGURATION_TYPE = "net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType"; //$NON-NLS-1$    
+       public static final String ID_PROGRAM_BUILDER_LAUNCH_CONFIGURATION_TYPE = PLUGIN_ID + ".ProgramBuilderLaunchConfigurationType"; //$NON-NLS-1$   
 
        // ------- Launch configuration category --------
        /**