Fix bug 129538 and 129539; Refactor on top of bug 109112 fix.
diff --git a/plugins/org.eclipse.datatools.sqltools.routineeditor/plugin.properties b/plugins/org.eclipse.datatools.sqltools.routineeditor/plugin.properties
index dd76d9b..59b8bcc 100644
--- a/plugins/org.eclipse.datatools.sqltools.routineeditor/plugin.properties
+++ b/plugins/org.eclipse.datatools.sqltools.routineeditor/plugin.properties
@@ -1,3 +1,4 @@
 Routineeditor.edit= &Edit...
+Routineeditor.run= &Run...
 
 Routineeditor.name=Routine Editor
\ No newline at end of file
diff --git a/plugins/org.eclipse.datatools.sqltools.routineeditor/plugin.xml b/plugins/org.eclipse.datatools.sqltools.routineeditor/plugin.xml
index 5b01ba2..6a9acfc 100644
--- a/plugins/org.eclipse.datatools.sqltools.routineeditor/plugin.xml
+++ b/plugins/org.eclipse.datatools.sqltools.routineeditor/plugin.xml
@@ -55,6 +55,7 @@
                         <instanceof value="org.eclipse.datatools.sqltools.routineeditor.ProcEditorInput"/>
                         <instanceof value="org.eclipse.datatools.sqltools.core.ProcIdentifier"/>
                         <instanceof value="org.eclipse.datatools.modelbase.sql.routines.Routine"/>
+                        <instanceof value="org.eclipse.datatools.modelbase.sql.tables.Trigger"/>
                      </or>
                   </iterate>
                   <count value="1"/>
@@ -91,6 +92,18 @@
 			       </or>
 	            </enablement>
 	         </action>
+	         <action
+	               label="%Routineeditor.run"
+	               class="org.eclipse.datatools.sqltools.routineeditor.ui.actions.RunAction"
+	               menubarPath="slot2"
+	               enablesFor="1"
+	               id="org.eclipse.datatools.sqltools.routineeditor.ui.actions.RunAction">
+	               <enablement>
+	               <or>
+				      	<objectClass name = "org.eclipse.datatools.modelbase.sql.tables.Trigger"/>
+			       </or>
+	            </enablement>
+	         </action>
 	         <visibility>
 			    	<or>
 				      	<objectClass name = "org.eclipse.datatools.modelbase.sql.tables.Trigger"/>
@@ -112,6 +125,18 @@
 			       </or>
 	            </enablement>
 	         </action>
+	         <action
+	               label="%Routineeditor.run"
+	               class="org.eclipse.datatools.sqltools.routineeditor.ui.actions.RunAction"
+	               menubarPath="slot2"
+	               enablesFor="1"
+	               id="org.eclipse.datatools.sqltools.routineeditor.ui.actions.RunAction">
+	               <enablement>
+	               <or>
+				      	<objectClass name = "org.eclipse.datatools.modelbase.sql.routines.Routine"/>
+			       </or>
+	            </enablement>
+	         </action>
 	         <visibility>
 			    	<or>
 				      	<objectClass name = "org.eclipse.datatools.modelbase.sql.routines.Routine"/>
diff --git a/plugins/org.eclipse.datatools.sqltools.routineeditor/src/org/eclipse/datatools/sqltools/routineeditor/launching/LaunchHelper.java b/plugins/org.eclipse.datatools.sqltools.routineeditor/src/org/eclipse/datatools/sqltools/routineeditor/launching/LaunchHelper.java
index 64700f1..6f50655 100644
--- a/plugins/org.eclipse.datatools.sqltools.routineeditor/src/org/eclipse/datatools/sqltools/routineeditor/launching/LaunchHelper.java
+++ b/plugins/org.eclipse.datatools.sqltools.routineeditor/src/org/eclipse/datatools/sqltools/routineeditor/launching/LaunchHelper.java
@@ -47,7 +47,7 @@
 public class LaunchHelper implements RoutineLaunchConfigurationAttribute
 {
 
-    public static ILaunchConfigurationType getDMPLaunchConfigType()
+    public static ILaunchConfigurationType getLaunchConfigType()
     {
         return DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(ROUTINE_LAUNCH_CONFIGURATION_TYPE);
     }
@@ -66,7 +66,7 @@
     {
         ILaunchConfigurationWorkingCopy wc = null;
 
-        ILaunchConfigurationType configType = getDMPLaunchConfigType();
+        ILaunchConfigurationType configType = getLaunchConfigType();
         wc = configType.newInstance(null, "externalCon" + connid);
         wc.setAttribute(ROUTINE_LAUNCH_PROFILENAME, databaseIdentifier.getProfileName());
         wc.setAttribute(ROUTINE_LAUNCH_DATABASENAME, databaseIdentifier.getDBname());
diff --git a/plugins/org.eclipse.datatools.sqltools.routineeditor/src/org/eclipse/datatools/sqltools/routineeditor/launching/RoutineLaunchConfigurationAttribute.java b/plugins/org.eclipse.datatools.sqltools.routineeditor/src/org/eclipse/datatools/sqltools/routineeditor/launching/RoutineLaunchConfigurationAttribute.java
index c60afa5..e707ca6 100644
--- a/plugins/org.eclipse.datatools.sqltools.routineeditor/src/org/eclipse/datatools/sqltools/routineeditor/launching/RoutineLaunchConfigurationAttribute.java
+++ b/plugins/org.eclipse.datatools.sqltools.routineeditor/src/org/eclipse/datatools/sqltools/routineeditor/launching/RoutineLaunchConfigurationAttribute.java
@@ -29,7 +29,7 @@
  */
 public interface RoutineLaunchConfigurationAttribute
 {
-    static final String ROUTINE_LAUNCH_CONFIGURATION_TYPE          = "org.eclipse.datatools.sqltools.launching.launchConfigurationType";
+    static final String ROUTINE_LAUNCH_CONFIGURATION_TYPE          = "org.eclipse.datatools.sqltools.routineeditor.launching.launchConfigurationType";
 
     // connection profile
     static final String ROUTINE_LAUNCH_PROFILENAME                 = "org.eclipse.datatools.sqltools.debug.launching.profileName";
diff --git a/plugins/org.eclipse.datatools.sqltools.routineeditor/src/org/eclipse/datatools/sqltools/routineeditor/parameter/LaunchConfigurationParamsHistoryListener.java b/plugins/org.eclipse.datatools.sqltools.routineeditor/src/org/eclipse/datatools/sqltools/routineeditor/parameter/LaunchConfigurationParamsHistoryListener.java
index 7aed8bd..13d21f5 100644
--- a/plugins/org.eclipse.datatools.sqltools.routineeditor/src/org/eclipse/datatools/sqltools/routineeditor/parameter/LaunchConfigurationParamsHistoryListener.java
+++ b/plugins/org.eclipse.datatools.sqltools.routineeditor/src/org/eclipse/datatools/sqltools/routineeditor/parameter/LaunchConfigurationParamsHistoryListener.java
@@ -66,7 +66,7 @@
         // a newly-created launch configuration or renamed configuration
         try
         {
-            if ((configuration.getType() == LaunchHelper.getDMPLaunchConfigType()) && _moveFrom != null)
+            if ((configuration.getType() == LaunchHelper.getLaunchConfigType()) && _moveFrom != null)
             {
                 ArrayList configs = readExistingConfigurations(configuration);
                 if (configs.size() != 0)