[richfaces-svn-commits] JBoss Rich Faces SVN: r4904 - trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit.

[richfaces-svn-commits at lists.jboss.org]

Author: abelevich
Date: 2007-12-18 14:01:49 -0500 (Tue, 18 Dec 2007)
New Revision: 4904

Modified:
   trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java
   trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java
Log:
remove method convertCursorStyle

Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java
===================================================================
--- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java	2007-12-18 17:24:46 UTC (rev 4903)
+++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java	2007-12-18 19:01:49 UTC (rev 4904)
@@ -75,10 +75,18 @@
 		public DraggableOptions(Draggable draggable) {
 			//TODO by nick - change this cast
 			super((UIComponent) draggable);
-
 			addOption("dragType", draggable.getDragType());
-			addOption("grab", convertCursorStyle(draggable.getGrabCursors()));
-			addOption("grabbing",convertCursorStyle(draggable.getGrabbingCursors()));
+			
+			String grab = draggable.getGrabCursors(); 
+			if (!grab.equals("")) {
+				addOption("grab", "cursor: " + grab);
+			}	
+			
+			String grabbing = draggable.getGrabbingCursors();
+			if (!grabbing.equals("")) {
+				addOption("grabbing","cursor: " + grabbing);
+			}
+			
 			addEventHandler("ondragstart", draggable.getOndragstart());
 			addEventHandler("ondragend", draggable.getOndragend());
 			addEventHandler("ondropover",draggable.getOndropover());
@@ -87,19 +95,6 @@
 		
 	}
 	
-	public String convertCursorStyle(String cursors){
-		StringBuffer cursorStyle = new StringBuffer();
-		if(cursors != null){
-			String [] entries = cursors.split(",");
-			for (int i = 0; i < entries.length; i++) {
-				if (!entries[i].equals("")) {
-					cursorStyle.append("cursor: " + entries[i] + ";");
-				}	
-			}
-		}	
-		return cursorStyle.toString(); 
-	}
-
 	public void decode(FacesContext context, UIComponent component, CompositeRenderer compositeRenderer) {
 		DnDEventsExchangeMailer eventsExchanger = DnDEventsExchangeMailer.getInstance(context);
 		String clientId = component.getClientId(context);

Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java
===================================================================
--- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java	2007-12-18 17:24:46 UTC (rev 4903)
+++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java	2007-12-18 19:01:49 UTC (rev 4904)
@@ -129,13 +129,11 @@
 			
 			String acceptCursors = zone.getAcceptCursors(); 
 			if (!acceptCursors.equals("")) {
-				acceptCursors = convertCursorStyle(acceptCursors);
 				addOption("acceptCursor", acceptCursors);
 			}
 				
 			String rejectCursors = zone.getRejectCursors();
 			if (!rejectCursors.equals("")) {
-				rejectCursors = convertCursorStyle(rejectCursors);
 				addOption("rejectCursor", rejectCursors);
 			}
 							
@@ -146,19 +144,6 @@
 			addEventHandler("ondropend");
 		}
 	}
-
-	public String convertCursorStyle(String cursors){
-		StringBuffer cursorStyle = new StringBuffer();
-		if(cursors != null){
-			String [] entries = cursors.split(",");
-			for (int i = 0; i < entries.length; i++) {
-				if (!entries[i].equals("")) {
-					cursorStyle.append("cursor: " + entries[i] + ";");
-				}	
-			}
-		}	
-		return cursorStyle.toString(); 
-	}
 	
 	public ScriptOptions buildOptions(FacesContext context, UIComponent drop) {
 		if (drop instanceof Dropzone) {