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

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

Revision: 1088
          http://cishell.svn.sourceforge.net/cishell/?rev=1088&view=rev
Author:   pataphil
Date:     2010-07-13 21:30:22 +0000 (Tue, 13 Jul 2010)

Log Message:
-----------
* Added ArrayListUtilities.unionCollectionsAsList()
* Added CollectionUtilities.get()
* Added SWTUtilities.printURL()
* Mild, mild cleanup.

Modified Paths:
--------------
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayListUtilities.java
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/CollectionUtilities.java
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/SWTUtilities.java
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/URLClickedListener.java
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/GUIModel.java

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayListUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayListUtilities.java	2010-07-13 18:06:07 UTC (rev 1087)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayListUtilities.java	2010-07-13 21:30:22 UTC (rev 1088)
@@ -31,6 +31,13 @@
 		
 		return union;
 	}
+
+	public static<T> List<T> unionCollectionsAsList(
+			Collection<T> items1,
+			Collection<T> items2,
+			Collection<T> keysToSkip) {
+		return new ArrayList<T>(unionCollections(items1, items2, keysToSkip));
+	}
 	
 	/* Implodes list to a String with the String.valueOf the elements separated
 	 * by separator and where all elements except the first prefixSize and

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/CollectionUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/CollectionUtilities.java	2010-07-13 18:06:07 UTC (rev 1087)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/CollectionUtilities.java	2010-07-13 21:30:22 UTC (rev 1088)
@@ -28,4 +28,8 @@
 		return selectedElements;
 	}
 
+	@SuppressWarnings("unchecked")
+	public static<T> T get(Collection<T> values, int index) {
+		return (T) values.toArray()[index];
+	}
 }

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/SWTUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/SWTUtilities.java	2010-07-13 18:06:07 UTC (rev 1087)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/SWTUtilities.java	2010-07-13 21:30:22 UTC (rev 1088)
@@ -4,6 +4,7 @@
 import org.eclipse.swt.custom.StyleRange;
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 public class SWTUtilities {
@@ -95,4 +96,28 @@
             textField.setTopIndex(textField.getLineCount());
         }
     }
+
+    public static void printURL(
+    		Composite parent,
+    		StyledText textField,
+    		String url,
+    		String displayURL,
+    		Color color,
+    		int style) {
+    	URLClickedListener urlClickedListener = new URLClickedListener(textField);
+		URLMouseCursorListener urlCursorListener =
+			new URLMouseCursorListener(parent, textField);
+		textField.addMouseListener(urlClickedListener);
+		textField.addMouseMoveListener(urlCursorListener);
+
+		urlClickedListener.addURL(
+        	textField.getText().length(), url, displayURL);
+        urlCursorListener.addURL(
+        	textField.getText().length(), url, displayURL);
+        SWTUtilities.styledPrint(
+        	textField,
+        	displayURL,
+        	color,
+        	style);
+    }
 }
\ No newline at end of file

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/URLClickedListener.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/URLClickedListener.java	2010-07-13 18:06:07 UTC (rev 1087)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/URLClickedListener.java	2010-07-13 21:30:22 UTC (rev 1088)
@@ -10,7 +10,7 @@
 import org.eclipse.swt.program.Program;
 
 /*
- * Listens for clicks on urls and launches a browser appropriately.
+ * Listens for clicks on urls and launches a browser.
  */
 public class URLClickedListener extends MouseAdapter {
     private Map<Integer, String> offsetsToURLs = new HashMap<Integer, String>();

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/GUIModel.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/GUIModel.java	2010-07-13 18:06:07 UTC (rev 1087)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/swt/model/GUIModel.java	2010-07-13 21:30:22 UTC (rev 1088)
@@ -53,7 +53,7 @@
 		return field;
 	}
 
-	public GUIModelField<String, Combo, DropDownDataSynchronizer> addSingleSelectionDropDown(
+	public GUIModelField<String, Combo, DropDownDataSynchronizer> addDropDown(
 			String name,
 			int selectedIndex,
 			Collection<String> unorderedOptionLabels,
@@ -117,7 +117,7 @@
 	// TODO: addCalendar
 
 	// TODO: Test this out.
-	public GUIModelField<String, List, SingleListSelectionDataSynchronizer> addSingleSelectionList(
+	public GUIModelField<String, List, SingleListSelectionDataSynchronizer> addList(
 			String name,
 			int selectedIndex,
 			Collection<String> unorderedOptionLabels,
@@ -145,7 +145,7 @@
 	// TODO: addSpinner
 	// TODO: addStyledText
 
-	public GUIModelField<String, Text, TextDataSynchronizer> addUnstyledText(
+	public GUIModelField<String, Text, TextDataSynchronizer> addText(
 			String name,
 			String value,
 			boolean isMultiLined,


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