[Databinding-Example] Added inline comments and another combined

SimonScholz · SimonScholz · commit 005e3bf661b2 · 2015-06-19T13:19:42.000+02:00
IConverter

Change-Id: I8d07b0f1ea8f202034a3431d3f4206f1436e2d02
Signed-off-by: Simon Scholz &lt;simon.scholz@vogella.com&gt;
diff --git a/de.vogella.databinding.example/src/de/vogella/databinding/example/View.java b/de.vogella.databinding.example/src/de/vogella/databinding/example/View.java
@@ -14,6 +14,8 @@
 import org.eclipse.jface.databinding.fieldassist.ControlDecorationSupport;
 import org.eclipse.jface.databinding.swt.ISWTObservableValue;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -49,9 +51,7 @@ public void createPartControl(Composite parent) {
 
 		person = createPerson();
 		// Lets put thing to order
-		GridLayout layout = new GridLayout(2, false);
-		layout.marginRight = 5;
-		parent.setLayout(layout);
+		GridLayoutFactory.swtDefaults().numColumns(2).applyTo(parent);
 
 		Label firstLabel = new Label(parent, SWT.NONE);
 		firstLabel.setText("Firstname: ");
@@ -84,14 +84,13 @@ public void createPartControl(Composite parent) {
 		Label countryLabel = new Label(parent, SWT.NONE);
 		countryLabel.setText("Country");
 		countryText = new Text(parent, SWT.BORDER);
-		
+
 		Label programmingSkillsLabel = new Label(parent, SWT.NONE);
 		programmingSkillsLabel.setText("Programming Skills");
+		GridDataFactory.swtDefaults().applyTo(programmingSkillsLabel);
+
 		programmingSkillsText = new Text(parent, SWT.BORDER);
-		gridData = new GridData();
-		gridData.horizontalAlignment = SWT.FILL;
-		gridData.grabExcessHorizontalSpace = true;
-		programmingSkillsText.setLayoutData(gridData);
+		GridDataFactory.fillDefaults().grab(true, false).applyTo(programmingSkillsText);
 
 		Button button1 = new Button(parent, SWT.PUSH);
 		button1.setText("Write model");
diff --git a/de.vogella.databinding.example/src/de/vogella/databinding/example/converter/CommaSeparatedStringStringArrayConverter.java b/de.vogella.databinding.example/src/de/vogella/databinding/example/converter/CommaSeparatedStringStringArrayConverter.java
@@ -0,0 +1,32 @@
+package de.vogella.databinding.example.converter;
+
+import org.eclipse.core.databinding.conversion.Converter;
+
+public class CommaSeparatedStringStringArrayConverter extends Converter {
+
+	public CommaSeparatedStringStringArrayConverter() {
+		// pass null for undefined fromType and toType
+		super(null, null);
+	}
+
+	@Override
+	public Object convert(Object fromObject) {
+		if (fromObject instanceof String) {
+			return ((String) fromObject).split(";");
+		} else if (fromObject instanceof String[]) {
+			String[] stringArray = (String[]) fromObject;
+			StringBuilder sb = new StringBuilder();
+			int length = stringArray.length;
+			for (int i = 0; i < length; i++) {
+				String string = stringArray[i];
+				sb.append(string);
+				if (i + 1 < length) {
+					sb.append(",");
+				}
+			}
+			return sb.toString();
+		}
+		throw new IllegalArgumentException(fromObject.getClass() + " type cannot be converted by " + getClass());
+	}
+
+}
diff --git a/de.vogella.databinding.example/src/de/vogella/databinding/example/converter/CommaSeparatedStringToStringArrayConverter.java b/de.vogella.databinding.example/src/de/vogella/databinding/example/converter/CommaSeparatedStringToStringArrayConverter.java
@@ -5,13 +5,14 @@
 public class CommaSeparatedStringToStringArrayConverter extends Converter {
 
 	public CommaSeparatedStringToStringArrayConverter() {
+		// Ensure that the fromType is a String and the toType is a String[] array
 		super(String.class, String[].class);
 	}
 
 	@Override
 	public Object convert(Object fromObject) {
 		if(fromObject instanceof String){
-			return ((String) fromObject).split(";");
+			return ((String) fromObject).split(",");
 		}
 		return null;
 	}
diff --git a/de.vogella.databinding.example/src/de/vogella/databinding/example/converter/StringArrayToCommaSeparatedStringConverter.java b/de.vogella.databinding.example/src/de/vogella/databinding/example/converter/StringArrayToCommaSeparatedStringConverter.java
@@ -5,6 +5,7 @@
 public class StringArrayToCommaSeparatedStringConverter extends Converter {
 
 	public StringArrayToCommaSeparatedStringConverter() {
+		// Ensure that the fromType is a String[] array and the toType is a String
 		super(String[].class, String.class);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,14 @@`
`5`	`5`	`public class CommaSeparatedStringToStringArrayConverter extends Converter {`
`6`	`6`
`7`	`7`	`public CommaSeparatedStringToStringArrayConverter() {`
	`8`	`+ // Ensure that the fromType is a String and the toType is a String[] array`
`8`	`9`	`super(String.class, String[].class);`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`@Override`
`12`	`13`	`public Object convert(Object fromObject) {`
`13`	`14`	`if(fromObject instanceof String){`
`14`		`- return ((String) fromObject).split(";");`
	`15`	`+ return ((String) fromObject).split(",");`
`15`	`16`	`}`
`16`	`17`	`return null;`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`public class StringArrayToCommaSeparatedStringConverter extends Converter {`
`6`	`6`
`7`	`7`	`public StringArrayToCommaSeparatedStringConverter() {`
	`8`	`+ // Ensure that the fromType is a String[] array and the toType is a String`
`8`	`9`	`super(String[].class, String.class);`
`9`	`10`	`}`
`10`	`11`