You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2015/08/13 01:19:09 UTC

svn commit: r1695624 - in /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic: ArrayType.java BasicType.java Type.java

Author: sebb
Date: Wed Aug 12 23:19:09 2015
New Revision: 1695624

URL: http://svn.apache.org/r1695624
Log:
BCEL-232 Make mutable fields private.

Modified:
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayType.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BasicType.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayType.java?rev=1695624&r1=1695623&r2=1695624&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayType.java Wed Aug 12 23:19:09 2015
@@ -79,7 +79,7 @@ public final class ArrayType extends Ref
             buf.append('[');
         }
         buf.append(basic_type.getSignature());
-        signature = buf.toString();
+        setSignature(buf.toString());
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BasicType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BasicType.java?rev=1695624&r1=1695623&r2=1695624&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BasicType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BasicType.java Wed Aug 12 23:19:09 2015
@@ -73,7 +73,7 @@ public final class BasicType extends Typ
      */
     @Override
     public int hashCode() {
-        return type;
+        return super.getType();
     }
 
 
@@ -81,6 +81,6 @@ public final class BasicType extends Typ
      */
     @Override
     public boolean equals( Object _type ) {
-        return (_type instanceof BasicType) ? ((BasicType) _type).type == this.type : false;
+        return (_type instanceof BasicType) ? ((BasicType) _type).getType() == this.getType() : false;
     }
 }

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java?rev=1695624&r1=1695623&r2=1695624&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java Wed Aug 12 23:19:09 2015
@@ -35,8 +35,8 @@ import org.apache.commons.bcel6.verifier
 public abstract class Type implements java.io.Serializable {
 
     private static final long serialVersionUID = -1985077286871826895L;
-    protected byte type;
-    protected String signature; // signature for the type
+    private final byte type;
+    private String signature; // signature for the type
     /** Predefined constants
      */
     public static final BasicType VOID = new BasicType(Constants.T_VOID);
@@ -391,4 +391,12 @@ public abstract class Type implements ja
         int index = signature.lastIndexOf(')') + 1;
         return Type.size(getTypeSize(signature.substring(index)));
     }
+
+
+    /**
+     * @param signature the signature to set
+     */
+    public void setSignature(String signature) {
+        this.signature = signature;
+    }
 }