Added check box synchronization.

Author: mytruth

org.rcpml.core/src/org/rcpml/core/datasource/DataSourceElementContentBinding.java

@@ -54,22 +54,6 @@ public Object getValueType() {
 	}
 
 	private Object getValueFromString(String s) {
-		if (type == int.class) {
-			try {
-				return new Integer(Integer.parseInt(s));
-			}
-			catch (Exception e) {
-				return null;
-			}
-		}
-		if (type == double.class) {
-			try {
-				return null;
-			}
-			catch (Exception e) {
-				return new Double(0);
-			}
-		}
 		return s;
 	}
 

org.rcpml.emf.example/editors/callgraph.xml

@@ -9,9 +9,14 @@
 
 	<composite id="topParent">
 		<group>
-			<label>Location</label><text path="emfds://@ports.0/location"/>
+			<!--label>Location</label><text path="emfds://@ports.0/location"/>
 			<label>Name</label><text path="emfds://@ships.0/name"/>
-			<label>Quantity</label><spinner path="emfds://@ships.0/@cargo.0/quantity"/>
+			<label>Quantity</label><spinner path="emfds://@ships.0/@cargo.0/quantity"/-->
+			
+			<label>Name</label><text path="emfds://name"/>
+			<label>Int</label><spinner path="emfds://int"/>
+			<label>Double</label><text path="emfds://double"/>
+			<label>On</label><checkbox path="emfds://on"/>
 		</group>
 	</composite>
 

org.rcpml.emf.example/plugin.xml

@@ -5,7 +5,7 @@
          point="org.eclipse.ui.editors">
       <editor
             class="org.rcpml.core.RCPMLExtension:/editors/callgraph.xml"
-            extensions="callgraph,callgraph_diagram,taipan,taipan_diagram"
+            extensions="callgraph,callgraph_diagram,taipan,taipan_diagram,model,model_diagram"
             icon="icons/sample.gif"
             id="org.rcpml.emf.editor.callgraph"
             name="RCPML Call Graph Editor">

org.rcpml.emf.example/src/org/ecpml/emf/example/EMFDataSourceElementBinding.java

@@ -62,8 +62,41 @@ public void handleValueChange(IDataSourceElementBinding source) {
 	}
 
 	private void changeValue(Object value) {
-		obj.eSet(feature, value);
+		try {
+			obj.eSet(feature, convertValue(value));
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+			//if value do not valid - ignore it
+		}
 		save();
 	}
+	
+	private Object convertValue(Object value) {
+		if (value == null)
+			return null;
+		if (value.getClass() == type) {
+			return value;
+		}
+		if (value instanceof String) {
+			String s = (String)value;
+			if (type == int.class) {
+				return new Integer(Integer.parseInt(s));
+			}
+			if (type == double.class) {
+				return new Double(Double.parseDouble(s));
+			}
+			if (type == boolean.class) {
+				return new Boolean(Boolean.parseBoolean(s));
+			}
+			if (type == long.class) {
+				return new Long(Long.parseLong(s));
+			}
+			if (type == short.class) {
+				return new Short(Short.parseShort(s));
+			}
+		}
+		return value;
+	}
 
 }

org.rcpml.emf.example/src/org/rcpml/emf/example/synch/EMFSynchronizator.java

@@ -2,10 +2,12 @@
 
 import java.io.File;
 import java.util.HashMap;
+import java.util.Iterator;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.emf.common.command.BasicCommandStack;
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -65,6 +67,11 @@ protected Resource getResource() {
 
 	public void setInput(IFileEditorInput input) {
 		updateFile(input);
+		Iterator it = resource.getContents().iterator();
+		while (it.hasNext()) {
+			EObject object = (EObject) it.next();
+			System.out.println(resource.getURIFragment(object));
+		}
 	}
 
 	public void fileChanged() {

org.rcpml.swt/src/org/rcpml/swt/AbstractSWTButtonBridge.java

@@ -1,5 +1,7 @@
 package org.rcpml.swt;
 
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.jface.databinding.swt.SWTObservables;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -9,6 +11,9 @@
 import org.rcpml.core.IController;
 import org.rcpml.core.RCPMLTagConstants;
 import org.rcpml.core.css.RCPCSSConstants;
+import org.rcpml.core.datasource.DataBinding;
+import org.rcpml.core.datasource.DataSourceElementContentBinding;
+import org.rcpml.swt.databinding.ElementTextObservable;
 import org.w3c.dom.Node;
 
 import com.xored.scripting.core.IScriptContextManager;
@@ -20,6 +25,7 @@ public abstract class AbstractSWTButtonBridge extends AbstractSWTBridge {
 
 	public static final String TITLE_ATTR = RCPMLTagConstants.TITLE_ATTR;	
 	private static final String ENABLED_ATTR = RCPMLTagConstants.ENABLED_ATTR;
+	private static final String PATH_ATTR = "path";
 
 	protected abstract int getStyle();	
 
@@ -45,7 +51,20 @@ protected void construct( Composite parent ) {
 
 		update();
 
-		initHandlers();		
+		initHandlers();
+
+		DataBindingContext dbc = this.getBindingContext();
+		
+		dbc.bindValue(SWTObservables.observeSelection(this.fButton), new ElementTextObservable(
+				getNode()), null, null );
+
+		String path = getAttribute(PATH_ATTR);
+		if (path != null && !path.equals("")) {
+			getController().bind(new DataBinding(
+					new DataSourceElementContentBinding(
+							getNode(), Boolean.class), path));
+		}
+		
 	}
 
 	protected void initHandlers() {