Factor Parameter Handler to more appropriate plugin. See Bug 283905.
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/icons/etool16/parameter_file.gif b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/icons/etool16/parameter_file.gif
deleted file mode 100644
index 6e63b99..0000000
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/icons/etool16/parameter_file.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/icons/etool16/parameter_view.gif b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/icons/etool16/parameter_view.gif
deleted file mode 100644
index d11c996..0000000
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/icons/etool16/parameter_view.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/icons/etool16/run_parameter.gif b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/icons/etool16/run_parameter.gif
deleted file mode 100644
index 65c6853..0000000
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/icons/etool16/run_parameter.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/icons/etool16/test_clipboard.gif b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/icons/etool16/test_clipboard.gif
deleted file mode 100644
index 96028b3..0000000
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/icons/etool16/test_clipboard.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/icons/etool16/test_file.gif b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/icons/etool16/test_file.gif
deleted file mode 100644
index 79a554e..0000000
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/icons/etool16/test_file.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/plugin.xml b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/plugin.xml
index 92b5bad..cb2710d 100644
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/plugin.xml
+++ b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/plugin.xml
@@ -9,12 +9,6 @@
 		<command categoryId="org.eclipse.amp.axf.ui"
 			id="org.eclipse.amp.escape.runtime.executeHeadless" name="Execute Headless">
 		</command>
-		<command categoryId="org.eclipse.amp.axf.ui"
-			id="org.eclipse.amp.escape.runtime.executeParam" name="Execute">
-		</command>
-		<command categoryId="org.eclipse.amp.axf.ui"
-			id="org.eclipse.amp.escape.runtime.executeParamHeadless" name="Execute Headless">
-		</command>
 	</extension>

 	<extension point="org.eclipse.ui.menus">

 		<menuContribution locationURI="popup:org.eclipse.ui.popup.any">

@@ -47,22 +41,6 @@
 					</reference>
 				</visibleWhen>
 			</command>
-			<command commandId="org.eclipse.amp.escape.runtime.executeParam"
-				icon="icons/etool16/execute.gif" label="Execute" style="push"
-				tooltip="Load and start an Escape model.">
-				<visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.amp.escape.allowexecuteParam">
-					</reference>
-				</visibleWhen>
-			</command>
-			<command commandId="org.eclipse.amp.escape.runtime.executeParamHeadless"
-				icon="icons/etool16/execute_headless.gif" label="Execute Headless" style="push"
-				tooltip="Load and start an Escape model in non-graphical mode.">
-				<visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.amp.escape.allowexecuteParam">
-					</reference>
-				</visibleWhen>
-			</command>
 		</menuContribution>

 		<menuContribution locationURI="menu:org.eclipse.amp.axf.ui.menu?after=additions">
 			<command commandId="org.eclipse.amp.escape.runtime.execute"
@@ -83,36 +61,6 @@
 			</command>

 		</menuContribution>
 		
-		<menuContribution locationURI="popup:org.eclipse.ui.popup.any">
-			<command commandId="org.eclipse.amp.escape.runtime.executeParam"
-				icon="icons/etool16/execute.gif" style="push" tooltip="Execute the model.">
-				<visibleWhen checkEnabled="true">
-				</visibleWhen>
-			</command>
-			<command commandId="org.eclipse.amp.escape.runtime.executeParamHeadless"
-				icon="icons/etool16/execute_headless.gif" style="push" tooltip="Execute the model.">
-				<visibleWhen checkEnabled="true">
-				</visibleWhen>
-			</command>
-		</menuContribution>
-		<menuContribution locationURI="menu:org.eclipse.amp.axf.ui.menu?after=additions">
-			<command commandId="org.eclipse.amp.escape.runtime.executeParam"
-				icon="icons/etool16/execute.gif" label="Execute" style="push"
-				tooltip="Load and start an Escape model.">
-				<visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.amp.escape.allowexecuteParam">
-					</reference>
-				</visibleWhen>
-			</command>
-			<command commandId="org.eclipse.amp.escape.runtime.executeParamHeadless"
-				icon="icons/etool16/execute_headless.gif" label="Execute Headless" style="push"
-				tooltip="Load and start an Escape model in non-graphical mode.">
-				<visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.amp.escape.allowexecuteParam">
-					</reference>
-				</visibleWhen>
-			</command>
-		</menuContribution>
   <menuContribution
         locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
      <toolbar
@@ -131,20 +79,6 @@
 				</with>

 			</or>

 		</definition>

-		<definition id="org.eclipse.amp.escape.allowexecuteParam">
-			<or>
-				<with variable="selection">
-					<iterate ifEmpty="false">
-							<adapt type="org.eclipse.core.resources.IResource">
-								<or>
-									<test property="org.eclipse.core.resources.name" value="*.apar">
-									</test>
-								</or>
-							</adapt>
-					</iterate>
-				</with>
-			</or>
-		</definition>

 	</extension>

 	<extension point="org.eclipse.ui.handlers">

 		<handler class="org.eclipse.amp.escape.command.ExecuteJavaHandler"

@@ -169,51 +103,19 @@
 				</reference>
 			</enabledWhen>
 		</handler>
-		<handler class="org.eclipse.amp.escape.command.ExecuteParameterHandler"
-			commandId="org.eclipse.amp.escape.runtime.executeParam">
-			<activeWhen>
-				<reference definitionId="org.eclipse.amp.escape.allowexecuteParam">
-				</reference>
-			</activeWhen>
-			<enabledWhen>
-				<reference definitionId="org.eclipse.amp.escape.allowexecuteParam">
-				</reference>
-			</enabledWhen>
-		</handler>
-		<handler class="org.eclipse.amp.escape.command.ExecuteParameterHeadlessHandler"
-			commandId="org.eclipse.amp.escape.runtime.executeParamHeadless">
-			<activeWhen>
-				<reference definitionId="org.eclipse.amp.escape.allowexecuteParam">
-				</reference>
-			</activeWhen>
-			<enabledWhen>
-				<reference definitionId="org.eclipse.amp.escape.allowexecuteParam">
-				</reference>
-			</enabledWhen>
-		</handler>
 	</extension>

 	<extension point="org.eclipse.ui.bindings">

 		<key commandId="org.eclipse.amp.escape.runtime.execute" contextId="org.eclipse.ui.contexts.window"

 			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" sequence="M1+L">

 		</key>
 	</extension>

-	<extension point="org.eclipse.ui.editors">
-		<editor class="org.eclipse.ui.editors.text.TextEditor" default="false"
-			extensions="apar" icon="icons/etool16/run_parameter.gif" id="org.eclipse.amp.escape.ide.parameterEditor"
-			name="Parameter Editor">
-		</editor>
-		<editor class="org.eclipse.ui.editors.text.TextEditor" default="false"
-			extensions="atest" icon="icons/etool16/test_file.gif" id="org.eclipse.amp.escape.ide.testEditor"
-			name="Test Editor">
-		</editor>
-	</extension>
 	<extension point="org.eclipse.ui.newWizards">
 		<wizard category="org.eclipse.amp.wizards"
 			class="org.eclipse.amp.escape.ide.ParameterFileWizard" icon="icons/etool16/run_parameter.gif"
 			id="org.eclipse.amp.escape.wizards.newParameters" name="Parameter File">
 		</wizard>
 		<wizard category="org.eclipse.amp.wizards" class="org.eclipse.amp.escape.ide.TestRunFileWizard"
-			icon="icons/etool16/test_file.gif" id="org.eclipse.amp.escape.wizards.newTest"
+			icon="icons/test_file.gif" id="org.eclipse.amp.escape.wizards.newTest"
 			name="Test File">
 		</wizard>
 	</extension>
@@ -257,7 +159,7 @@
 			name="Model Parameters">
 		</editor>
 		<editor class="org.eclipse.ui.editors.text.TextEditor" default="false"
-			extensions="atest" icon="icons/etool16/test_file.gif" id="org.eclipse.amp.escape.ide.TestEditor"
+			extensions="atest" icon="icons/test_file.gif" id="org.eclipse.amp.escape.ide.TestEditor"
 			name="Model Test">
 		</editor>
 	</extension>
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/src/org/eclipse/amp/escape/command/ExecuteParameterHandler.java b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/src/org/eclipse/amp/escape/command/ExecuteParameterHandler.java
deleted file mode 100644
index d16e588..0000000
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/src/org/eclipse/amp/escape/command/ExecuteParameterHandler.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**

- * <copyright>

- *

- * Copyright (c) 2009 Metascape, LLC.

- * All rights reserved.   This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *   Metascape - Initial API and Implementation

- *

- * </copyright>

- *

- */

-package org.eclipse.amp.escape.command;

-

-import org.eclipse.amp.escape.ide.EclipseEscapeRunner;

-import org.eclipse.amp.escape.ide.ParameterReader;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.ui.statushandlers.StatusManager;

-

-// TODO: Auto-generated Javadoc

-/**

- * The Class ExecuteParameterHandler.

- */

-public class ExecuteParameterHandler extends ExecuteHandler {

-

-    /**

-     * Instantiates a new execute parameter handler.

-     * 

-     * @param headless

-     *        the headless

-     */

-    public ExecuteParameterHandler(boolean headless) {

-        super(headless);

-    }

-

-    /**

-     * Instantiates a new execute parameter handler.

-     */

-    public ExecuteParameterHandler() {

-        super(false);

-    }

-

-    /* (non-Javadoc)

-     * @see org.eclipse.amp.escape.command.ExecuteHandler#executeOpen(org.eclipse.amp.escape.ide.EclipseEscapeRunner, java.lang.Object, org.eclipse.core.runtime.IProgressMonitor)

-     */

-    protected void executeOpen(EclipseEscapeRunner eclipseRunner, Object executed, IProgressMonitor monitor) {

-        if (executed instanceof IResource) {

-            IResource modelResource = (IResource) executed;

-            if (modelResource.getFileExtension().equals("apar")) {

-                IPath loc = modelResource.getLocation();

-                ParameterReader pr = new ParameterReader(modelResource.getProject(), loc);

-                String modelClass = pr.modelClassNameFromFile();

-                if (modelClass == null) {

-                    StatusManager.getManager()

-                    .handle(

-                            new Status(Status.ERROR, "org.eclipse.amp.escape.runtime",

-                                       "No model class specified in: " + modelResource.getName()

-                                       + ". First line should be \"model + TAB + class path + \"."),

-                                       StatusManager.SHOW);

-                    return;

-                }

-                String runName = pr.titleFromFile();

-                String[] args = ParameterReader.argsFromPV(pr.pvsFromFile());

-                eclipseRunner.open(modelResource.getProject(), modelClass, runName, args);

-            }

-        }

-    }

-

-    /*

-     * (non-Javadoc)

-     * 

-     * @see org.eclipse.amp.escape.command.ExecuteHandler#handleSelect(java.lang.Object)

-     */

-    protected boolean handleSelect(Object sel) {

-        return sel instanceof IResource && ((IResource) sel).getFileExtension() != null

-        && ((IResource) sel).getFileExtension().equals("apar");

-    }

-}

diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/src/org/eclipse/amp/escape/command/ExecuteParameterHeadlessHandler.java b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/src/org/eclipse/amp/escape/command/ExecuteParameterHeadlessHandler.java
deleted file mode 100644
index 36f739d..0000000
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/src/org/eclipse/amp/escape/command/ExecuteParameterHeadlessHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**

- * <copyright>

- *

- * Copyright (c) 2009 Metascape, LLC.

- * All rights reserved.   This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *   Metascape - Initial API and Implementation

- *

- * </copyright>

- *

- */

-package org.eclipse.amp.escape.command;

-

-// TODO: Auto-generated Javadoc

-/**

- * The Class ExecuteParameterHeadlessHandler.

- */

-public class ExecuteParameterHeadlessHandler extends ExecuteParameterHandler {

-

-    /**

-     * Instantiates a new execute parameter headless handler.

-     */

-    public ExecuteParameterHeadlessHandler() {

-        super(true);

-    }

-}