commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcucchi...@apache.org
Subject svn commit: r1194875 - in /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance: LocalReferenceImpl.java OrderedReturn.java package-info.java
Date Sat, 29 Oct 2011 11:21:21 GMT
Author: mcucchiara
Date: Sat Oct 29 11:21:20 2011
New Revision: 1194875

URL: http://svn.apache.org/viewvc?rev=1194875&view=rev
Log:
OGNL-11: fixed checkstyle errors

Modified:
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/LocalReferenceImpl.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/OrderedReturn.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/package-info.java

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/LocalReferenceImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/LocalReferenceImpl.java?rev=1194875&r1=1194874&r2=1194875&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/LocalReferenceImpl.java
(original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/LocalReferenceImpl.java
Sat Oct 29 11:21:20 2011
@@ -26,17 +26,17 @@ public class LocalReferenceImpl
     implements LocalReference
 {
 
-    private final String _name;
+    private final String name;
 
-    private final Class<?> _type;
+    private final Class<?> type;
 
-    private final String _expression;
+    private final String expression;
 
     public LocalReferenceImpl( String name, String expression, Class<?> type )
     {
-        _name = name;
-        _type = type;
-        _expression = expression;
+        this.name = name;
+        this.type = type;
+        this.expression = expression;
     }
 
     /**
@@ -44,7 +44,7 @@ public class LocalReferenceImpl
      */
     public String getName()
     {
-        return _name;
+        return name;
     }
 
     /**
@@ -52,7 +52,7 @@ public class LocalReferenceImpl
      */
     public String getExpression()
     {
-        return _expression;
+        return expression;
     }
 
     /**
@@ -60,7 +60,7 @@ public class LocalReferenceImpl
      */
     public Class<?> getType()
     {
-        return _type;
+        return type;
     }
 
     /**
@@ -80,15 +80,15 @@ public class LocalReferenceImpl
 
         LocalReferenceImpl that = (LocalReferenceImpl) o;
 
-        if ( _expression != null ? !_expression.equals( that._expression ) : that._expression
!= null )
+        if ( expression != null ? !expression.equals( that.expression ) : that.expression
!= null )
         {
             return false;
         }
-        if ( _name != null ? !_name.equals( that._name ) : that._name != null )
+        if ( name != null ? !name.equals( that.name ) : that.name != null )
         {
             return false;
         }
-        if ( _type != null ? !_type.equals( that._type ) : that._type != null )
+        if ( type != null ? !type.equals( that.type ) : that.type != null )
         {
             return false;
         }
@@ -103,9 +103,9 @@ public class LocalReferenceImpl
     public int hashCode()
     {
         int result;
-        result = ( _name != null ? _name.hashCode() : 0 );
-        result = 31 * result + ( _type != null ? _type.hashCode() : 0 );
-        result = 31 * result + ( _expression != null ? _expression.hashCode() : 0 );
+        result = ( name != null ? name.hashCode() : 0 );
+        result = 31 * result + ( type != null ? type.hashCode() : 0 );
+        result = 31 * result + ( expression != null ? expression.hashCode() : 0 );
         return result;
     }
 
@@ -115,7 +115,7 @@ public class LocalReferenceImpl
     @Override
     public String toString()
     {
-        return "LocalReferenceImpl[" + "_name='" + _name + '\'' + '\n' + ", _type=" + _type
+ '\n' + ", _expression='"
-            + _expression + '\'' + '\n' + ']';
+        return "LocalReferenceImpl[" + "_name='" + name + '\'' + '\n' + ", _type=" + type
+ '\n' + ", _expression='"
+            + expression + '\'' + '\n' + ']';
     }
 }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/OrderedReturn.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/OrderedReturn.java?rev=1194875&r1=1194874&r2=1194875&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/OrderedReturn.java
(original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/OrderedReturn.java
Sat Oct 29 11:21:20 2011
@@ -19,10 +19,10 @@ package org.apache.commons.ognl.enhance;
  * under the License.
  */
 
-import org.apache.commons.ognl.Node;
 
 /**
- * Marks an ognl expression {@link Node} as needing to have the return portion of a getter
method happen in a specific
+ * Marks an ognl expression {@link org.apache.commons.ognl.Node} as needing to have the return
portion of a getter
+ * method happen in a specific
  * part of the generated expression vs just having the whole expression returned in one chunk.
  */
 public interface OrderedReturn

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/package-info.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/package-info.java?rev=1194875&r1=1194874&r2=1194875&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/package-info.java
(original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/package-info.java
Sat Oct 29 11:21:20 2011
@@ -1,6 +1,3 @@
-/**
- * Enhanced basic Java components.
- */
 package org.apache.commons.ognl.enhance;
 
 /*
@@ -21,3 +18,7 @@ package org.apache.commons.ognl.enhance;
  * specific language governing permissions and limitations
  * under the License.
  */
+
+/*
+ * Enhanced basic Java components.
+ */



Mime
View raw message