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/12 14:51:57 UTC

svn commit: r1695497 - in /commons/proper/bcel/trunk/src: changes/changes.xml main/java/org/apache/commons/bcel6/classfile/AccessFlags.java

Author: sebb
Date: Wed Aug 12 12:51:57 2015
New Revision: 1695497

URL: http://svn.apache.org/r1695497
Log:
BCEL-233 The access_flags field in AccessFlags class should be final

Modified:
    commons/proper/bcel/trunk/src/changes/changes.xml
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AccessFlags.java

Modified: commons/proper/bcel/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/changes/changes.xml?rev=1695497&r1=1695496&r2=1695497&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/changes/changes.xml (original)
+++ commons/proper/bcel/trunk/src/changes/changes.xml Wed Aug 12 12:51:57 2015
@@ -63,6 +63,7 @@ The <action> type attribute can be add,u
 
   <body>
     <release version="6.0" date="TBA" description="Major release with Java 7 and 8 support">
+      <action issue="BCEL-233" type="fix">The access_flags field in AccessFlags class should be final</action>
       <action issue="BCEL-234" type="fix">Code must not swallow Throwable</action>
       <action issue="BCEL-222" type="update">
         Major release of BCEL requires updating package name and maven coordinates.

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AccessFlags.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AccessFlags.java?rev=1695497&r1=1695496&r2=1695497&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AccessFlags.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AccessFlags.java Wed Aug 12 12:51:57 2015
@@ -28,10 +28,11 @@ import org.apache.commons.bcel6.Constant
 public abstract class AccessFlags implements java.io.Serializable {
 
     private static final long serialVersionUID = 2845404654039163061L;
-    protected int access_flags; // TODO make private (has getter & setter)
+    private final int access_flags;
 
 
     public AccessFlags() {
+        this(0);
     }
 
 
@@ -59,180 +60,76 @@ public abstract class AccessFlags implem
     }
 
 
-    /** Set access flags aka "modifiers".
-     * @param access_flags Access flags of the object. 
-     */
-    public final void setAccessFlags( int access_flags ) {
-        this.access_flags = access_flags;
-    }
-
-
-    /** Set access flags aka "modifiers".
-     * @param access_flags Access flags of the object. 
-     */
-    public final void setModifiers( int access_flags ) {
-        setAccessFlags(access_flags);
-    }
-
-
-    private void setFlag( int flag, boolean set ) {
-        if ((access_flags & flag) != 0) { // Flag is set already
-            if (!set) {
-                access_flags ^= flag;
-            }
-        } else { // Flag not set
-            if (set) {
-                access_flags |= flag;
-            }
-        }
-    }
-
-
-    public final void isPublic( boolean flag ) {
-        setFlag(Constants.ACC_PUBLIC, flag);
-    }
-
-
     public final boolean isPublic() {
         return (access_flags & Constants.ACC_PUBLIC) != 0;
     }
 
 
-    public final void isPrivate( boolean flag ) {
-        setFlag(Constants.ACC_PRIVATE, flag);
-    }
-
-
     public final boolean isPrivate() {
         return (access_flags & Constants.ACC_PRIVATE) != 0;
     }
 
 
-    public final void isProtected( boolean flag ) {
-        setFlag(Constants.ACC_PROTECTED, flag);
-    }
-
-
     public final boolean isProtected() {
         return (access_flags & Constants.ACC_PROTECTED) != 0;
     }
 
 
-    public final void isStatic( boolean flag ) {
-        setFlag(Constants.ACC_STATIC, flag);
-    }
-
-
     public final boolean isStatic() {
         return (access_flags & Constants.ACC_STATIC) != 0;
     }
 
 
-    public final void isFinal( boolean flag ) {
-        setFlag(Constants.ACC_FINAL, flag);
-    }
-
-
     public final boolean isFinal() {
         return (access_flags & Constants.ACC_FINAL) != 0;
     }
 
 
-    public final void isSynchronized( boolean flag ) {
-        setFlag(Constants.ACC_SYNCHRONIZED, flag);
-    }
-
-
     public final boolean isSynchronized() {
         return (access_flags & Constants.ACC_SYNCHRONIZED) != 0;
     }
 
 
-    public final void isVolatile( boolean flag ) {
-        setFlag(Constants.ACC_VOLATILE, flag);
-    }
-
-
     public final boolean isVolatile() {
         return (access_flags & Constants.ACC_VOLATILE) != 0;
     }
 
 
-    public final void isTransient( boolean flag ) {
-        setFlag(Constants.ACC_TRANSIENT, flag);
-    }
-
-
     public final boolean isTransient() {
         return (access_flags & Constants.ACC_TRANSIENT) != 0;
     }
 
 
-    public final void isNative( boolean flag ) {
-        setFlag(Constants.ACC_NATIVE, flag);
-    }
-
-
     public final boolean isNative() {
         return (access_flags & Constants.ACC_NATIVE) != 0;
     }
 
 
-    public final void isInterface( boolean flag ) {
-        setFlag(Constants.ACC_INTERFACE, flag);
-    }
-
-
     public final boolean isInterface() {
         return (access_flags & Constants.ACC_INTERFACE) != 0;
     }
 
 
-    public final void isAbstract( boolean flag ) {
-        setFlag(Constants.ACC_ABSTRACT, flag);
-    }
-
-
     public final boolean isAbstract() {
         return (access_flags & Constants.ACC_ABSTRACT) != 0;
     }
 
 
-    public final void isStrictfp( boolean flag ) {
-        setFlag(Constants.ACC_STRICT, flag);
-    }
-
-
     public final boolean isStrictfp() {
         return (access_flags & Constants.ACC_STRICT) != 0;
     }
 
 
-    public final void isSynthetic( boolean flag ) {
-        setFlag(Constants.ACC_SYNTHETIC, flag);
-    }
-
-
     public final boolean isSynthetic() {
         return (access_flags & Constants.ACC_SYNTHETIC) != 0;
     }
 
 
-    public final void isAnnotation( boolean flag ) {
-        setFlag(Constants.ACC_ANNOTATION, flag);
-    }
-
-
     public final boolean isAnnotation() {
         return (access_flags & Constants.ACC_ANNOTATION) != 0;
     }
 
 
-    public final void isEnum( boolean flag ) {
-        setFlag(Constants.ACC_ENUM, flag);
-    }
-
-
     public final boolean isEnum() {
         return (access_flags & Constants.ACC_ENUM) != 0;
     }