svn commit: r1398110 - in /tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile: ElementValue.java EnumElementValue.java

[markt]

Author: markt
Date: Sun Oct 14 18:19:33 2012
New Revision: 1398110

URL: http://svn.apache.org/viewvc?rev=1398110&view=rev
Log:
Unused field identified by Eclipse

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
    
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java?rev=1398110&r1=1398109&r2=1398110&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java 
Sun Oct 14 18:19:33 2012
@@ -101,7 +101,8 @@ public abstract class ElementValue
             return new SimpleElementValue(STRING, dis.readUnsignedShort(),
                     cpool);
         case 'e': // Enum constant
-            return new EnumElementValue(ENUM_CONSTANT, dis.readUnsignedShort(),
+            dis.readUnsignedShort();    // Unused type_index
+            return new EnumElementValue(ENUM_CONSTANT,
                     dis.readUnsignedShort(), cpool);
         case 'c': // Class
             return new ClassElementValue(CLASS, dis.readUnsignedShort(), 
cpool);

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java?rev=1398110&r1=1398109&r2=1398110&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java 
Sun Oct 14 18:19:33 2012
@@ -21,19 +21,14 @@ import org.apache.tomcat.util.bcel.Const
 
 public class EnumElementValue extends ElementValue
 {
-    // For enum types, these two indices point to the type and value
-    private int typeIdx;
-
     private int valueIdx;
 
-    public EnumElementValue(int type, int typeIdx, int valueIdx,
-            ConstantPool cpool)
+    public EnumElementValue(int type, int valueIdx, ConstantPool cpool)
     {
         super(type, cpool);
         if (type != ENUM_CONSTANT)
             throw new RuntimeException(
                     "Only element values of type enum can be built with this 
ctor - type specified: " + type);
-        this.typeIdx = typeIdx;
         this.valueIdx = valueIdx;
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org