[richfaces-svn-commits] JBoss Rich Faces SVN: r2820 - in trunk: framework/impl/src/main/java/org/ajax4jsf/util and 2 other directories.

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

Author: alexsmirnov
Date: 2007-09-07 16:13:39 -0400 (Fri, 07 Sep 2007)
New Revision: 2820

Added:
   trunk/framework/impl/src/main/java/org/ajax4jsf/util/ELUtils.java
Modified:
   trunk/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java
   trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java
   trunk/ui/scrollableDataTable/src/main/java/org/richfaces/model/internal/ObjectWrapperFactory.java
Log:
Remove JSP Tag class dependency from model.

Modified: trunk/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java	2007-09-07 19:22:59 UTC (rev 2819)
+++ trunk/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java	2007-09-07 20:13:39 UTC (rev 2820)
@@ -141,29 +141,6 @@
 	
 	
 	/**
-	 * Get EL-enabled value. Return same string, if not el-expression.
-	 * Otherthise, return parsed and evaluated expression.
-	 * 
-	 * @param context -
-	 *            current Faces Context.
-	 * @param value -
-	 *            string to parse.
-	 * @return - interpreted el or unmodified value.
-	 */
-	protected static boolean isValueReference(String value) {
-		if (value == null)
-			return false;
-
-		int start = value.indexOf("#{");
-		if (start >= 0) {
-			int end = value.lastIndexOf('}');
-			if (end >= 0 && start < end) {
-				return true;
-			}
-		}
-		return false;
-	}
-	/**
 	 * Resource Uri for file with name of class for application-wide SkinFactory same as SPI definitions for common Java SAX, Jsf etc. factories
 	 */
 	public static final String SERVICE_RESOURCE = "META-INF/services/" + SkinFactory.class.getName();

Added: trunk/framework/impl/src/main/java/org/ajax4jsf/util/ELUtils.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/util/ELUtils.java	                        (rev 0)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/util/ELUtils.java	2007-09-07 20:13:39 UTC (rev 2820)
@@ -0,0 +1,40 @@
+/**
+ * 
+ */
+package org.ajax4jsf.util;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class ELUtils {
+	
+	private ELUtils() {
+		// Utility class with static methods only - do not instantiate.
+	}
+
+	/**
+	 * Get EL-enabled value. Return same string, if not el-expression.
+	 * Otherthise, return parsed and evaluated expression.
+	 * 
+	 * @param context -
+	 *            current Faces Context.
+	 * @param value -
+	 *            string to parse.
+	 * @return - interpreted el or unmodified value.
+	 */
+	public static boolean isValueReference(String value) {
+		if (value == null)
+			return false;
+
+		int start = value.indexOf("#{");
+		if (start >= 0) {
+			int end = value.lastIndexOf('}');
+			if (end >= 0 && start < end) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+}


Property changes on: trunk/framework/impl/src/main/java/org/ajax4jsf/util/ELUtils.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Date Revision Author

Modified: trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java	2007-09-07 19:22:59 UTC (rev 2819)
+++ trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java	2007-09-07 20:13:39 UTC (rev 2820)
@@ -39,6 +39,7 @@
 import javax.faces.el.ValueBinding;
 
 import org.ajax4jsf.Messages;
+import org.ajax4jsf.util.ELUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.richfaces.skin.Skin;
@@ -223,7 +224,7 @@
 					// not set - usr default.
 					return DEFAULT_SKIN_NAME;
 				}
-				if (SkinFactory.isValueReference(currentSkinName)) {
+				if (ELUtils.isValueReference(currentSkinName)) {
 					// For EL expression as skin name
 					binding = context.getApplication().createValueBinding(
 							currentSkinName);
@@ -344,7 +345,7 @@
 								Messages.SKIN_CYCLIC_REFERENCE, propertyName));
 					}
 				}
-				if (SkinFactory.isValueReference(property)) {
+				if (ELUtils.isValueReference(property)) {
 					skinParams.put(propertyName, app
 							.createValueBinding(property));
 				} else {

Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/model/internal/ObjectWrapperFactory.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/model/internal/ObjectWrapperFactory.java	2007-09-07 19:22:59 UTC (rev 2819)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/model/internal/ObjectWrapperFactory.java	2007-09-07 20:13:39 UTC (rev 2820)
@@ -29,8 +29,8 @@
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
 import javax.faces.el.PropertyResolver;
-import javax.faces.webapp.UIComponentTag;
 
+import org.ajax4jsf.util.ELUtils;
 import org.richfaces.model.SortField;
 import org.richfaces.model.SortOrder;
 /**
@@ -68,7 +68,7 @@
 			final SortField field = sortFields[i];
 			final String name = field.getName();
 			
-			if (UIComponentTag.isValueReference(name)) {
+			if (ELUtils.isValueReference(name)) {
 				
 				expressions[i] = new ValueBindingExpression(context, name, var);