[WIP] add graphical support to define parameters with sirius

Author: ipa-nhg

plugins/de.fraunhofer.ipa.ros.sirius/src/de/fraunhofer/ipa/ros/sirius/ExternalJavaActionNewParameter.java

@@ -1,8 +1,11 @@
 package de.fraunhofer.ipa.ros.sirius;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 
+import javax.swing.JOptionPane;
+
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.emf.common.util.URI;
@@ -17,22 +20,29 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.dialogs.ElementListSelectionDialog;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
 import ros.Parameter;
 import ros.ParameterBoolean;
 import ros.ParameterStringType;
 import ros.ParameterType;
+import ros.impl.ParameterArrayTypeImpl;
+import ros.impl.ParameterBase64TypeImpl;
 import ros.impl.ParameterBooleanImpl;
 import ros.impl.ParameterBooleanTypeImpl;
 import ros.impl.ParameterDateTypeImpl;
 import ros.impl.ParameterDoubleTypeImpl;
 import ros.impl.ParameterImpl;
 import ros.impl.ParameterIntegerTypeImpl;
+import ros.impl.ParameterListTypeImpl;
 import ros.impl.ParameterStringImpl;
 import ros.impl.ParameterStringTypeImpl;
+import ros.impl.ParameterStructTypeImpl;
 import ros.impl.ParameterTypeImpl;
 
 
 public class ExternalJavaActionNewParameter implements IExternalJavaAction { 
+
 	public IFile modelFile;
 	protected IWorkbench workbench;
 	protected IStructuredSelection selection;
@@ -60,28 +70,67 @@ public void execute(Collection<? extends EObject> arg0, Map<String, Object> arg1
 		Parameter param = param_collection.iterator().next();
 		ParameterType type = null;
 
-		dlg.setElements( new Object[] {"Boolean","String","Integer","Date","Double"});
+		dlg.setElements( new Object[] {"Boolean","String","Integer","Date","Double","Base64", "List", "Array","Struc"});
 		dlg.open();
 
 		Object selected_type = dlg.getFirstResult();
-		if (selected_type.toString() == "Boolean") {
+		type = GetSelectedType(selected_type.toString(), activeShell);
+
+		/**if (selected_type.toString() == "List") {
+			type = new ParameterListTypeImpl();
+		}
+		if (selected_type.toString() == "Struc") {
+			type = new ParameterStructTypeImpl();
+		}*/
+		param.setType(type);
+}
+	
+	public ParameterType GetSelectedType(String selected_type, Shell activeShell) {
+		ParameterType type = null;
+		if (selected_type== "Boolean") {
 			type = new ParameterBooleanTypeImpl();
 		}
-		if (selected_type.toString() == "String") {
+		if (selected_type == "String") {
 			type = new ParameterStringTypeImpl();
 		}
-		if (selected_type.toString() == "Integer") {
+		if (selected_type == "Integer") {
 			type = new ParameterIntegerTypeImpl();
 		}
-		if (selected_type.toString() == "Date") {
+		if (selected_type == "Date") {
 			type = new ParameterDateTypeImpl();
 		}
 		if (selected_type.toString() == "Double") {
 			type = new ParameterDoubleTypeImpl();
 		}
-		param.setType(type);
+		if (selected_type.toString() == "Base64") {
+			type = new ParameterBase64TypeImpl();
+		}
+		if (selected_type.toString() == "Array") {
+			ParameterType subtype = null;
+			type = new ParameterArrayTypeImpl();
+			ElementListSelectionDialog dlg = new ElementListSelectionDialog(activeShell, new LabelProvider());
+			dlg.setTitle("ArraySubtype");
+			dlg.setMessage("Select a type for the elements of your Array:");
+			dlg.setElements( new Object[] {"Boolean","String","Integer","Date","Double","Base64", "List", "Array","Struc"});
+			dlg.open();
+			Object selected_subtype = dlg.getFirstResult();
+			subtype = GetSelectedType(selected_subtype.toString(), activeShell);
+			((ParameterArrayTypeImpl) type).setType(subtype);
+		}
+		if (selected_type.toString() == "List") {
+			ArrayList<ParameterType> subtypes = null;
+			type = new ParameterListTypeImpl();
 
+			InputDialog dlg = new InputDialog(activeShell, "Lenght of the list parameter", null, "2",null);
+		    if (dlg.open() == 0) {
+		    	String param = dlg.getValue();
+		    }
 
-}
+			/**Object selected_subtype = dlg.
+			subtype = GetSelectedType(selected_subtype.toString(), activeShell);
+			((ParameterArrayTypeImpl) type).setType(subtype);*/
+		}
+		return type;
+	}
 }
 

plugins/de.fraunhofer.ipa.ros/src/ros/impl/ParameterArrayTypeImpl.java

@@ -55,7 +55,7 @@ public class ParameterArrayTypeImpl extends ParameterTypeImpl implements Paramet
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected ParameterArrayTypeImpl() {
+	public ParameterArrayTypeImpl() {
 		super();
 	}
 

plugins/de.fraunhofer.ipa.ros/src/ros/impl/ParameterBase64TypeImpl.java

@@ -43,7 +43,7 @@ public class ParameterBase64TypeImpl extends ParameterTypeImpl implements Parame
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected ParameterBase64TypeImpl() {
+	public ParameterBase64TypeImpl() {
 		super();
 	}
 

plugins/de.fraunhofer.ipa.ros/src/ros/impl/ParameterListTypeImpl.java

@@ -62,7 +62,7 @@ public class ParameterListTypeImpl extends ParameterTypeImpl implements Paramete
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected ParameterListTypeImpl() {
+	public ParameterListTypeImpl() {
 		super();
 	}
 

plugins/de.fraunhofer.ipa.ros/src/ros/impl/ParameterStructTypeImpl.java

@@ -47,7 +47,7 @@ public class ParameterStructTypeImpl extends ParameterTypeImpl implements Parame
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected ParameterStructTypeImpl() {
+	public ParameterStructTypeImpl() {
 		super();
 	}