[CIShell-SVN] SF.net SVN: cishell:[1199] trunk/core/org.cishell.utility.swt/src/org/ cishell/utility/swt/SWTUtilities.java

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

Revision: 1199
          http://cishell.svn.sourceforge.net/cishell/?rev=1199&view=rev
Author:   pataphil
Date:     2011-02-08 18:42:31 +0000 (Tue, 08 Feb 2011)

Log Message:
-----------
* Styled text helpers now return created StyledRange objects.

Modified Paths:
--------------
    trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/SWTUtilities.java

Modified: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/SWTUtilities.java
===================================================================
--- trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/SWTUtilities.java	2011-02-08 17:58:33 UTC (rev 1198)
+++ trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/SWTUtilities.java	2011-02-08 18:42:31 UTC (rev 1199)
@@ -1,5 +1,8 @@
 package org.cishell.utility.swt;
 
+import java.util.Collection;
+import java.util.HashSet;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyleRange;
 import org.eclipse.swt.custom.StyledText;
@@ -8,17 +11,37 @@
 import org.eclipse.swt.widgets.Display;
 
 public class SWTUtilities {
+	public static final Color DEFAULT_BACKGROUND_COLOR =
+		new Color(Display.getDefault(), 255, 255, 255);
 	/*
      * Append the given string to the console with the given color, this will do the job of
      *  checking for URLs within the string and registering the proper listeners on them as well.
      */
-    public static void appendStringWithURL(
+	public static Collection<StyleRange> appendStringWithURL(
     		StyledText textField,
     		URLClickedListener urlListener,
     		URLMouseCursorListener urlCursorListener,
     		String message,
     		Color normalColor,
     		Color urlColor) {
+		return appendStringWithURL(
+			textField,
+			urlListener,
+			urlCursorListener,
+			message,
+			DEFAULT_BACKGROUND_COLOR,
+			normalColor,
+			urlColor);
+	}
+
+    public static Collection<StyleRange> appendStringWithURL(
+    		StyledText textField,
+    		URLClickedListener urlListener,
+    		URLMouseCursorListener urlCursorListener,
+    		String message,
+    		Color backgroundColor,
+    		Color normalColor,
+    		Color urlColor) {
     
     	//find a URL in the message
     
@@ -52,18 +75,46 @@
             }
                
 
-            syncedStyledPrint(textField, message.substring(0, index), normalColor, SWT.NORMAL);
+            StyleRange preURLStyle = syncedStyledPrint(
+            	textField, message.substring(0, index), backgroundColor, normalColor, SWT.NORMAL);
             urlListener.addURL(textField.getText().length(), url);
             urlCursorListener.addURL(textField.getText().length(), url);
-            syncedStyledPrint(textField, url, urlColor, SWT.BOLD);
-            appendStringWithURL(
+            StyleRange urlStyle =
+            	syncedStyledPrint(textField, url, backgroundColor, urlColor, SWT.BOLD);
+            Collection<StyleRange> postURLStyles = appendStringWithURL(
             	textField,
             	urlListener,
             	urlCursorListener,
             	message.substring(index + url.length()),
-            	normalColor,urlColor);
+            	backgroundColor,
+            	normalColor,
+            	urlColor);
+
+            Collection<StyleRange> finalStyles = new HashSet<StyleRange>();
+
+            if (preURLStyle != null) {
+            	finalStyles.add(preURLStyle);
+            }
+
+            if (urlStyle != null) {
+            	finalStyles.add(urlStyle);
+            }
+
+            finalStyles.addAll(postURLStyles);
+
+            return finalStyles;
         } else {
-            syncedStyledPrint(textField, message, normalColor, SWT.NORMAL);
+            StyleRange style = syncedStyledPrint(
+            	textField, message, backgroundColor, normalColor, SWT.NORMAL);
+
+            if (style != null) {
+            	Collection<StyleRange> finalStyles = new HashSet<StyleRange>();
+            	finalStyles.add(style);
+
+            	return finalStyles;
+            } else {
+            	return new HashSet<StyleRange>();
+            }
         }
     }
 
@@ -72,16 +123,29 @@
      * append it to the StyledText control.
      */
 
-    public static void syncedStyledPrint(
-    		final StyledText textField, final String message, final Color color, final int style) {        
+    public static StyleRange syncedStyledPrint(
+    		StyledText textField, String message, Color color, int style) {
+    	return syncedStyledPrint(textField, message, DEFAULT_BACKGROUND_COLOR, color, style);
+    }
+
+    public static StyleRange syncedStyledPrint(
+    		final StyledText textField,
+    		final String message,
+    		final Color backgroundColor,
+    		final Color color,
+    		final int style) {
+    	final StyleRange[] styleRange = new StyleRange[1];
         Display.getDefault().syncExec(new Runnable() {
-            public void run(){
-		        styledPrint(textField, message, color, style);
+            public void run() {
+		        styleRange[0] = styledPrint(textField, message, color, style);
             }
         });
+
+        return styleRange[0];
     }
 
-    public static void styledPrint(StyledText textField, String message, Color color, int style) {
+    public static StyleRange styledPrint(
+    		StyledText textField, String message, Color color, int style) {
     	if (!textField.isDisposed()) {
             textField.append(message);
 
@@ -94,10 +158,14 @@
 
             // This makes it autoscroll.
             textField.setTopIndex(textField.getLineCount());
+
+            return styleRange;
+        } else {
+        	return null;
         }
     }
 
-    public static void printURL(
+    public static StyleRange printURL(
     		Composite parent,
     		StyledText textField,
     		String url,
@@ -105,19 +173,13 @@
     		Color color,
     		int style) {
     	URLClickedListener urlClickedListener = new URLClickedListener(textField);
-		URLMouseCursorListener urlCursorListener =
-			new URLMouseCursorListener(parent, 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);
+		urlClickedListener.addURL(textField.getText().length(), url, displayURL);
+        urlCursorListener.addURL(textField.getText().length(), url, displayURL);
+
+        return styledPrint(textField, displayURL, color, style);
     }
 }
\ No newline at end of file


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