empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From doeb...@apache.org
Subject svn commit: r1026870 - in /incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2: action/ actionsupport/ jsp/components/ jsp/tags/ web/
Date Sun, 24 Oct 2010 19:32:30 GMT
Author: doebele
Date: Sun Oct 24 19:32:30 2010
New Revision: 1026870

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

Modified:
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/action/WebAction.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionBase.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ListActionSupport.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/TextProviderActionSupport.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/DataValueComponent.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ActionErrorsTag.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/FormSubmitTag.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ItemListTag.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpireFilterDispatcher.java

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/action/WebAction.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/action/WebAction.java?rev=1026870&r1=1026869&r2=1026870&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/action/WebAction.java
(original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/action/WebAction.java
Sun Oct 24 19:32:30 2010
@@ -198,7 +198,6 @@ public abstract class WebAction extends 
         return getText(msgKey, args);
     }
     
-    @SuppressWarnings("unchecked")
     protected void setActionError(ErrorInfo error)
     {
         // Check error param
@@ -298,7 +297,6 @@ public abstract class WebAction extends 
         return StringUtils.toString(msg);
     }
     
-    @SuppressWarnings("unchecked")
     protected void setActionMessage(String message)
     {   // put Message on session
         if (message.startsWith("!"))
@@ -337,7 +335,7 @@ public abstract class WebAction extends 
         return textProvider.getText(aTextName, defaultValue, obj);
     }
 
-    public String getText(String aTextName, List args) {
+    public String getText(String aTextName, List<Object> args) {
         return textProvider.getText(aTextName, args);
     }
 
@@ -345,7 +343,7 @@ public abstract class WebAction extends 
         return textProvider.getText(key, args);
     }
 
-    public String getText(String aTextName, String defaultValue, List args) {
+    public String getText(String aTextName, String defaultValue, List<Object> args)
{
         return textProvider.getText(aTextName, defaultValue, args);
     }
 
@@ -353,7 +351,7 @@ public abstract class WebAction extends 
         return textProvider.getText(key, defaultValue, args);
     }
 
-    public String getText(String key, String defaultValue, List args, ValueStack stack) {
+    public String getText(String key, String defaultValue, List<Object> args, ValueStack
stack) {
         return textProvider.getText(key, defaultValue, args, stack);
     }
 

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionBase.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionBase.java?rev=1026870&r1=1026869&r2=1026870&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionBase.java
(original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionBase.java
Sun Oct 24 19:32:30 2010
@@ -76,7 +76,6 @@ public abstract class ActionBase
         return context.getSession().get(key);
     }
     
-    @SuppressWarnings("unchecked")
     protected void putActionObject(String name, Object item)
     {   // Put object
         ActionContext context = ActionContext.getContext();
@@ -123,7 +122,6 @@ public abstract class ActionBase
         return proxy.getActionName()+ "." + ownerProperty + "." + objClass.getName();
     }
     
-    @SuppressWarnings("unchecked")
     public Object getActionBean(Class objClass, boolean create, String ownerProperty)
     {
         if (objClass==null)
@@ -151,7 +149,6 @@ public abstract class ActionBase
         return getActionBean(objClass, create, null);
     }
     
-    @SuppressWarnings("unchecked")
     public void putActionBean(Object obj, String ownerProperty)
     {
         if (obj==null || obj instanceof String || obj.getClass().isPrimitive() || obj.getClass().isArray())
@@ -171,7 +168,6 @@ public abstract class ActionBase
         putActionBean(obj, null);
     }
     
-    @SuppressWarnings("unchecked")
     public void removeActionBean(Class objClass, String propertyName)
     {
         if (objClass==null)

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ListActionSupport.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ListActionSupport.java?rev=1026870&r1=1026869&r2=1026870&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ListActionSupport.java
(original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ListActionSupport.java
Sun Oct 24 19:32:30 2010
@@ -132,12 +132,12 @@ public abstract class ListActionSupport 
         public boolean sortDescending;
     }
     
-    private ListSortInfo lsi = null;
+    private ListSortInfo listSortInfo = null;
     protected ListSortInfo getListSortInfo()
     {
-        if (lsi== null)
-            lsi = (ListSortInfo)action.getActionBean(ListSortInfo.class, true, propertyName);
-        return lsi;
+        if (listSortInfo== null)
+        	listSortInfo = (ListSortInfo)action.getActionBean(ListSortInfo.class, true, propertyName);
+        return listSortInfo;
     }
     
     // ------- ListSortInfo -------

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/TextProviderActionSupport.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/TextProviderActionSupport.java?rev=1026870&r1=1026869&r2=1026870&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/TextProviderActionSupport.java
(original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/TextProviderActionSupport.java
Sun Oct 24 19:32:30 2010
@@ -80,7 +80,7 @@ public class TextProviderActionSupport e
     
     // ------- Overrides -------
     @Override
-    public String getText(String key, String defaultValue, List args)
+    public String getText(String key, String defaultValue, List<Object> args)
     {
         if(key==null)
         {

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/DataValueComponent.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/DataValueComponent.java?rev=1026870&r1=1026869&r2=1026870&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/DataValueComponent.java
(original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/DataValueComponent.java
Sun Oct 24 19:32:30 2010
@@ -40,7 +40,7 @@ public class DataValueComponent extends 
 {
     // Logger
     @SuppressWarnings("hiding")
-    protected static Log log = LogFactory.getLog(DataValueComponent.class);
+	protected static Log log = LogFactory.getLog(DataValueComponent.class);
 
     protected UrlRenderer urlRenderer;
 

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ActionErrorsTag.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ActionErrorsTag.java?rev=1026870&r1=1026869&r2=1026870&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ActionErrorsTag.java
(original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ActionErrorsTag.java
Sun Oct 24 19:32:30 2010
@@ -96,7 +96,7 @@ public class ActionErrorsTag extends Emp
         boolean hasActionError = (lastActionError!=null && lastActionError.hasError());
         boolean hasFieldErrors = (fieldErrors!=null && fieldErrors.size()>0);

 
-        // Check wether we have an error to render
+        // Check whether we have an error to render
         if (hasActionError==false && hasFieldErrors==false)
         {   // No Errors, nothing to render
             return;

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/FormSubmitTag.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/FormSubmitTag.java?rev=1026870&r1=1026869&r2=1026870&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/FormSubmitTag.java
(original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/FormSubmitTag.java
Sun Oct 24 19:32:30 2010
@@ -72,7 +72,6 @@ public class FormSubmitTag extends Empir
         log.error("Illegar mehtod call.");
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public int doStartTag() throws JspException
     {
@@ -97,7 +96,6 @@ public class FormSubmitTag extends Empir
         return EVAL_BODY_INCLUDE;
     }
     
-    @SuppressWarnings("unchecked")
     @Override
     public int doEndTag() throws JspException
     {

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ItemListTag.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ItemListTag.java?rev=1026870&r1=1026869&r2=1026870&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ItemListTag.java
(original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ItemListTag.java
Sun Oct 24 19:32:30 2010
@@ -95,7 +95,6 @@ public class ItemListTag extends Iterato
             srcObject = null;
         }
 
-        @SuppressWarnings("unchecked")
         @Override
         public boolean start(Writer writer)
         {
@@ -164,7 +163,6 @@ public class ItemListTag extends Iterato
             return false;
         }
 
-        @SuppressWarnings("unchecked")
         @Override
         public boolean end(Writer writer, String body)
         {

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpireFilterDispatcher.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpireFilterDispatcher.java?rev=1026870&r1=1026869&r2=1026870&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpireFilterDispatcher.java
(original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpireFilterDispatcher.java
Sun Oct 24 19:32:30 2010
@@ -27,6 +27,7 @@ import javax.servlet.FilterConfig;
 import org.apache.struts2.dispatcher.Dispatcher;
 import org.apache.struts2.dispatcher.FilterDispatcher;
 
+@SuppressWarnings("deprecation")
 public class EmpireFilterDispatcher extends FilterDispatcher
 {
     public EmpireFilterDispatcher()



Mime
View raw message