empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From doeb...@apache.org
Subject svn commit: r694359 - in /incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src: META-INF/ org/apache/empire/struts2/actionsupport/ org/apache/empire/struts2/interceptors/ org/apache/empire/struts2/jsp/tags/
Date Thu, 11 Sep 2008 17:09:49 GMT
Author: doebele
Date: Thu Sep 11 10:09:46 2008
New Revision: 694359

URL: http://svn.apache.org/viewvc?rev=694359&view=rev
Log:
EMPIREDB-13

Modified:
    incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/META-INF/empire-tags.tld
    incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/actionsupport/ActionPropertySupport.java
    incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/interceptors/InterceptorSupport.java
    incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/EmpireTagSupport.java
    incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/EmpireValueTagSupport.java

Modified: incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/META-INF/empire-tags.tld
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/META-INF/empire-tags.tld?rev=694359&r1=694358&r2=694359&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/META-INF/empire-tags.tld
(original)
+++ incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/META-INF/empire-tags.tld
Thu Sep 11 10:09:46 2008
@@ -1554,6 +1554,12 @@
 	  <type>java.lang.String</type>
     </attribute>
     <attribute>
+      <name>column</name>
+      <required>false</required>
+	  <rtexprvalue>true</rtexprvalue>
+	  <type>org.apache.empire.data.Column</type>
+    </attribute>
+    <attribute>
       <name>record</name>
       <required>false</required>
 	  <rtexprvalue>true</rtexprvalue>
@@ -1823,6 +1829,12 @@
 	  <type>java.lang.Object</type>
     </attribute>
     <attribute>
+      <name>onclick</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+	  <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
       <name>cssClass</name>
       <required>false</required>
       <rtexprvalue>false</rtexprvalue>

Modified: incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/actionsupport/ActionPropertySupport.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/actionsupport/ActionPropertySupport.java?rev=694359&r1=694358&r2=694359&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/actionsupport/ActionPropertySupport.java
(original)
+++ incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/actionsupport/ActionPropertySupport.java
Thu Sep 11 10:09:46 2008
@@ -75,6 +75,22 @@
         this.value = value;
     }
     
+    /**
+     * Sets the property value from a request param.
+     * The request must contain a property of that name. 
+     * @return true if the param was supplied with the request or false otherwise
+     */
+    public boolean setFromRequest()
+    {
+        String param = action.getRequestParam(propertyName);
+        if (param==null)
+        {   // Param has not been supplied
+            return false;
+        }
+        setValue(param);
+        return true;
+    }
+    
     public void clear()
     {
         // Remove from session

Modified: incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/interceptors/InterceptorSupport.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/interceptors/InterceptorSupport.java?rev=694359&r1=694358&r2=694359&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/interceptors/InterceptorSupport.java
(original)
+++ incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/interceptors/InterceptorSupport.java
Thu Sep 11 10:09:46 2008
@@ -30,6 +30,7 @@
 
 import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
 
+@SuppressWarnings("serial")
 public abstract class InterceptorSupport extends AbstractInterceptor
 {
     // Logger

Modified: incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/EmpireTagSupport.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/EmpireTagSupport.java?rev=694359&r1=694358&r2=694359&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/EmpireTagSupport.java
(original)
+++ incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/EmpireTagSupport.java
Thu Sep 11 10:09:46 2008
@@ -41,7 +41,7 @@
 import com.opensymphony.xwork2.LocaleProvider;
 import com.opensymphony.xwork2.TextProvider;
 
-
+@SuppressWarnings("serial")
 public abstract class EmpireTagSupport extends ComponentTagSupport
 {
     // Logger

Modified: incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/EmpireValueTagSupport.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/EmpireValueTagSupport.java?rev=694359&r1=694358&r2=694359&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/EmpireValueTagSupport.java
(original)
+++ incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/EmpireValueTagSupport.java
Thu Sep 11 10:09:46 2008
@@ -24,6 +24,7 @@
 import org.apache.empire.data.Record;
 import org.apache.empire.data.RecordData;
 
+@SuppressWarnings("serial")
 public abstract class EmpireValueTagSupport extends EmpireTagSupport
 {
     public static final String RECORD_ATTRIBUTE    = "record";
@@ -134,6 +135,8 @@
             return getFullPropertyName(field);
         if (value instanceof ColumnExpr)
             return getColumnPropertyName((ColumnExpr)value);
+        if (column!=null)
+            return getColumnPropertyName(column);
         // Not Name provided 
         log.error("Cannot detect name from value.");
         return "";



Mime
View raw message