Return-Path: Delivered-To: apmail-click-commits-archive@www.apache.org Received: (qmail 2293 invoked from network); 14 Mar 2010 12:15:28 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 14 Mar 2010 12:15:28 -0000 Received: (qmail 21166 invoked by uid 500); 14 Mar 2010 12:14:45 -0000 Delivered-To: apmail-click-commits-archive@click.apache.org Received: (qmail 21149 invoked by uid 500); 14 Mar 2010 12:14:45 -0000 Mailing-List: contact commits-help@click.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: click-dev@click.apache.org Delivered-To: mailing list commits@click.apache.org Received: (qmail 21141 invoked by uid 99); 14 Mar 2010 12:14:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Mar 2010 12:14:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Mar 2010 12:14:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 85BE5238899B; Sun, 14 Mar 2010 12:14:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r922822 - in /click/trunk/click/framework/src/org/apache/click: control/Column.java util/PropertyUtils.java Date: Sun, 14 Mar 2010 12:14:22 -0000 To: commits@click.apache.org From: medgar@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100314121422.85BE5238899B@eris.apache.org> Author: medgar Date: Sun Mar 14 12:14:22 2010 New Revision: 922822 URL: http://svn.apache.org/viewvc?rev=922822&view=rev Log: CLK-606 Modified: click/trunk/click/framework/src/org/apache/click/control/Column.java click/trunk/click/framework/src/org/apache/click/util/PropertyUtils.java Modified: click/trunk/click/framework/src/org/apache/click/control/Column.java URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/control/Column.java?rev=922822&r1=922821&r2=922822&view=diff ============================================================================== --- click/trunk/click/framework/src/org/apache/click/control/Column.java (original) +++ click/trunk/click/framework/src/org/apache/click/control/Column.java Sun Mar 14 12:14:22 2010 @@ -203,7 +203,7 @@ public class Column implements Serializa // ----------------------------------------------------- Instance Variables /** The Column attributes Map. */ - protected Map attributes; + protected Map attributes; /** * The automatically hyperlink column URL and email address values flag, @@ -215,7 +215,7 @@ public class Column implements Serializa protected String dataClass; /** The Map of column table data <td> CSS style attributes. */ - protected Map dataStyles; + protected Map dataStyles; /** The column row decorator. */ protected Decorator decorator; @@ -230,7 +230,7 @@ public class Column implements Serializa protected String headerClass; /** The Map of column table header <th> CSS style attributes. */ - protected Map headerStyles; + protected Map headerStyles; /** The title of the column header. */ protected String headerTitle; @@ -258,7 +258,7 @@ public class Column implements Serializa protected Boolean renderId; /** The method cached for rendering column values. */ - protected transient Map methodCache; + protected transient Map methodCache; /** The column sortable status. The default value is false. */ protected Boolean sortable; @@ -276,6 +276,7 @@ public class Column implements Serializa protected String width; /** The column comparator object, which is used to sort column row values. */ + @SuppressWarnings("unchecked") Comparator comparator; // ----------------------------------------------------------- Constructors @@ -360,9 +361,9 @@ public class Column implements Serializa * * @return the column attributes Map. */ - public Map getAttributes() { + public Map getAttributes() { if (attributes == null) { - attributes = new HashMap(); + attributes = new HashMap(); } return attributes; } @@ -403,6 +404,7 @@ public class Column implements Serializa * * @return the column row data sorting comparator object. */ + @SuppressWarnings("unchecked") public Comparator getComparator() { if (comparator == null) { comparator = new ColumnComparator(this); @@ -416,6 +418,7 @@ public class Column implements Serializa * * @param comparator the column row data sorting comparator object */ + @SuppressWarnings("unchecked") public void setComparator(Comparator comparator) { this.comparator = comparator; } @@ -485,9 +488,9 @@ public class Column implements Serializa * * @return the Map of table data <td> CSS styles */ - public Map getDataStyles() { + public Map getDataStyles() { if (dataStyles == null) { - dataStyles = new HashMap(); + dataStyles = new HashMap(); } return dataStyles; } @@ -925,9 +928,9 @@ public class Column implements Serializa * * @return the Map of table header <th> CSS styles */ - public Map getHeaderStyles() { + public Map getHeaderStyles() { if (headerStyles == null) { - headerStyles = new HashMap(); + headerStyles = new HashMap(); } return headerStyles; } @@ -1295,6 +1298,7 @@ public class Column implements Serializa * @return the named row object property value * @throws RuntimeException if an error occurred obtaining the property */ + @SuppressWarnings("unchecked") public Object getProperty(String name, Object row) { if (row instanceof Map) { Map map = (Map) row; @@ -1320,7 +1324,7 @@ public class Column implements Serializa } else { if (methodCache == null) { - methodCache = new HashMap(); + methodCache = new HashMap(); } return PropertyUtils.getValue(row, name, methodCache); @@ -1443,6 +1447,7 @@ public class Column implements Serializa * @see org.apache.click.control.Column * @see org.apache.click.control.Table */ + @SuppressWarnings("unchecked") static class ColumnComparator implements Comparator, Serializable { private static final long serialVersionUID = 1L; Modified: click/trunk/click/framework/src/org/apache/click/util/PropertyUtils.java URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/util/PropertyUtils.java?rev=922822&r1=922821&r2=922822&view=diff ============================================================================== --- click/trunk/click/framework/src/org/apache/click/util/PropertyUtils.java (original) +++ click/trunk/click/framework/src/org/apache/click/util/PropertyUtils.java Sun Mar 14 12:14:22 2010 @@ -29,6 +29,7 @@ import ognl.OgnlException; /** * Provide property getter and setter utility methods. */ +@SuppressWarnings("unchecked") public class PropertyUtils { /** Provides a synchronized cache of OGNL expressions. */