[CIShell-SVN] SF.net SVN: cishell:[1091] trunk/core/org.cishell.utilities/src/org/cishell /utilities

[<pat...@us...>]

Revision: 1091
          http://cishell.svn.sourceforge.net/cishell/?rev=1091&view=rev
Author:   pataphil
Date:     2010-07-21 00:47:14 +0000 (Wed, 21 Jul 2010)

Log Message:
-----------
* Added MapUtilities.valuesByKeys().
* Fixed some SWT GUIModel bugs.

Modified Paths:
--------------
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/MapUtilities.java
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/GUIModelGroup.java
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/datasynchronizer/TextDataSynchronizer.java

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/MapUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/MapUtilities.java	2010-07-16 02:11:57 UTC (rev 1090)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/MapUtilities.java	2010-07-21 00:47:14 UTC (rev 1091)
@@ -63,4 +63,18 @@
 
 		return valuesByIndex;
 	}
+
+	public static<K, V> void valuesByKeys(
+			Map<K, V> items, Collection<K> keys, Collection<V> target) {
+		for (K key : keys) {
+			target.add(items.get(key));
+		}
+	}
+
+	public static<K, V> Collection<V> valuesByKeys(Map<K, V> items, Collection<K> keys) {
+		List<V> values = new ArrayList<V>();
+		valuesByKeys(items, keys, values);
+
+		return values;
+	}
 }
\ No newline at end of file

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/GUIModelGroup.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/GUIModelGroup.java	2010-07-16 02:11:57 UTC (rev 1090)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/GUIModelGroup.java	2010-07-21 00:47:14 UTC (rev 1091)
@@ -50,6 +50,8 @@
 
 	public<T> void removeField(
 			GUIModelField<T, ? extends Widget, ? extends ModelDataSynchronizer<?>> field) {
-		this.inputFieldsByName.remove(field);
+		if (this.inputFieldsByName.containsValue(field)) {
+			this.inputFieldsByName.remove(field.getName());
+		}
 	}
 }
\ No newline at end of file

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/datasynchronizer/TextDataSynchronizer.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/datasynchronizer/TextDataSynchronizer.java	2010-07-16 02:11:57 UTC (rev 1090)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/datasynchronizer/TextDataSynchronizer.java	2010-07-21 00:47:14 UTC (rev 1091)
@@ -13,7 +13,7 @@
 	}
 
 	public int swtUpdateListenerCode() {
-		return SWT.Selection;
+		return SWT.Modify;
 	}
 
 	public String value() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.