ExecutionModelWizardGeneralPage implemented.

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.computationmodel.ui/plugin.properties

@@ -32,8 +32,8 @@ _UI_OpenEditorError_label = Open Editor
 
 _UI_CreateModelError_message = Problems encountered in file "{0}"
 
-_UI_ComputationModelModelWizard_label = Computation Model
-_UI_ComputationModelModelWizard_description = Create a new computation model
+_UI_ComputationModelWizard_label = Computation Model
+_UI_ComputationModelWizard_description = Create a new computation model
 
 _UI_ComputationModelEditor_label = Computation Model Editor
 

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.computationmodel.ui/plugin.xml

@@ -12,12 +12,12 @@
 
    <extension point="org.eclipse.ui.newWizards">
       <wizard
-            id="org.eclipselabs.mscript.computation.computationmodel.ui.editor.presentation.ComputationModelModelWizardID"
-            name="%_UI_ComputationModelModelWizard_label"
-            class="org.eclipselabs.mscript.computation.computationmodel.ui.editor.presentation.ComputationModelModelWizard"
+            id="org.eclipselabs.mscript.computation.computationmodel.ui.editor.presentation.ComputationModelWizardID"
+            name="%_UI_ComputationModelWizard_label"
+            class="org.eclipselabs.mscript.computation.computationmodel.ui.editor.presentation.ComputationModelWizard"
             category="org.eclipselabs.mscript.common.ui.mscriptCategory"
-            icon="icons/full/obj16/ComputationModelModelFile.gif">
-         <description>%_UI_ComputationModelModelWizard_description</description>
+            icon="icons/full/obj16/ComputationModelFile.gif">
+         <description>%_UI_ComputationModelWizard_description</description>
          <selection class="org.eclipse.core.resources.IResource"/>
       </wizard>
    </extension>
@@ -26,7 +26,7 @@
       <editor
             id="org.eclipselabs.mscript.computation.computationmodel.ui.editor.presentation.ComputationModelEditorID"
             name="%_UI_ComputationModelEditor_label"
-            icon="icons/full/obj16/ComputationModelModelFile.gif"
+            icon="icons/full/obj16/ComputationModelFile.gif"
             extensions="computationmodel"
             class="org.eclipselabs.mscript.computation.computationmodel.ui.editor.presentation.ComputationModelEditor"
             contributorClass="org.eclipselabs.mscript.computation.computationmodel.ui.editor.presentation.ComputationModelActionBarContributor">

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.computationmodel.ui/src/org/eclipselabs/mscript/computation/computationmodel/ui/editor/presentation/ComputationModelModelWizard.java

@@ -60,7 +60,7 @@ import org.eclipselabs.mscript.typesystem.TypeSystemFactory;
  * <!-- end-user-doc -->
  * @generated NOT
  */
-public class ComputationModelModelWizard extends Wizard implements INewWizard {
+public class ComputationModelWizard extends Wizard implements INewWizard {
 	/**
 	 * The supported extensions for created files.
 	 * <!-- begin-user-doc -->
@@ -101,7 +101,7 @@ public class ComputationModelModelWizard extends Wizard implements INewWizard {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected ComputationModelModelWizardNewFileCreationPage newFileCreationPage;
+	protected ComputationModelWizardNewFileCreationPage newFileCreationPage;
 
 	/**
 	 * Remember the selection during initialization for populating the default container.
@@ -257,16 +257,16 @@ public class ComputationModelModelWizard extends Wizard implements INewWizard {
 	 * This is the one page of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
-	public class ComputationModelModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+	public class ComputationModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
 		/**
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		public ComputationModelModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+		public ComputationModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
 			super(pageId, selection);
 		}
 
@@ -310,9 +310,9 @@ public class ComputationModelModelWizard extends Wizard implements INewWizard {
 	public void addPages() {
 		// Create a page, set the title, and the initial model file name.
 		//
-		newFileCreationPage = new ComputationModelModelWizardNewFileCreationPage("Whatever", selection);
-		newFileCreationPage.setTitle(ComputationModelUIPlugin.INSTANCE.getString("_UI_ComputationModelModelWizard_label"));
-		newFileCreationPage.setDescription(ComputationModelUIPlugin.INSTANCE.getString("_UI_ComputationModelModelWizard_description"));
+		newFileCreationPage = new ComputationModelWizardNewFileCreationPage("Whatever", selection);
+		newFileCreationPage.setTitle(ComputationModelUIPlugin.INSTANCE.getString("_UI_ComputationModelWizard_label"));
+		newFileCreationPage.setDescription(ComputationModelUIPlugin.INSTANCE.getString("_UI_ComputationModelWizard_description"));
 		newFileCreationPage.setFileName(ComputationModelUIPlugin.INSTANCE.getString("_UI_ComputationModelEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
 		addPage(newFileCreationPage);
 

org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.computation.computationmodel/model/ComputationModel.genmodel

@@ -13,7 +13,8 @@
   <foreignModel>ComputationModel.ecore</foreignModel>
   <genPackages prefix="ComputationModel" basePackage="org.eclipselabs.mscript.computation"
       disposableProviderFactory="true" providerPackageSuffix="edit.provider" presentationPackageSuffix="ui.editor.presentation"
-      multipleEditorPages="false" contentTypeIdentifier="" ecorePackage="ComputationModel.ecore#/">
+      multipleEditorPages="false" generateModelWizard="false" contentTypeIdentifier=""
+      ecorePackage="ComputationModel.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="ComputationModel.ecore#//FloatingPointFormatKind">
       <genEnumLiterals ecoreEnumLiteral="ComputationModel.ecore#//FloatingPointFormatKind/Binary16"/>
       <genEnumLiterals ecoreEnumLiteral="ComputationModel.ecore#//FloatingPointFormatKind/Binary32"/>