You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2010/05/25 02:20:31 UTC
svn commit: r947872 - in /jakarta/bcel/trunk/src/main/java/org/apache/bcel:
classfile/ generic/ util/ verifier/ verifier/structurals/
Author: sebb
Date: Tue May 25 00:20:30 2010
New Revision: 947872
URL: http://svn.apache.org/viewvc?rev=947872&view=rev
Log:
Fix Eclipse warnings
Modified:
jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java
jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java
jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java
jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java
jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java
jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java
jakarta/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifyDialog.java
jakarta/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java
Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java?rev=947872&r1=947871&r2=947872&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java Tue May 25 00:20:30 2010
@@ -63,11 +63,6 @@ public class AnnotationEntry implements
return annotationEntry;
}
- /**
- * Construct object from file stream.
- *
- * @param file Input stream
- */
public AnnotationEntry(int type_index, ConstantPool constant_pool, boolean isRuntimeVisible) {
this.type_index = type_index;
this.constant_pool = constant_pool;
Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java?rev=947872&r1=947871&r2=947872&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java Tue May 25 00:20:30 2010
@@ -333,7 +333,7 @@ public abstract class Utility {
case Constants.NEW:
case Constants.CHECKCAST:
buf.append("\t");
- /* FALL THRU */
+ //$FALL-THROUGH$
case Constants.INSTANCEOF:
index = bytes.readUnsignedShort();
buf.append("\t<").append(
Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java?rev=947872&r1=947871&r2=947872&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java Tue May 25 00:20:30 2010
@@ -52,7 +52,7 @@ public class AnnotationEntryGen
int l = in.length;
for (int i = 0; i < l; i++)
{
- ElementValuePair nvp = (ElementValuePair) in[i];
+ ElementValuePair nvp = in[i];
out.add(new ElementValuePairGen(nvp, cpool, copyPoolEntries));
}
return out;
Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java?rev=947872&r1=947871&r2=947872&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java Tue May 25 00:20:30 2010
@@ -19,7 +19,6 @@ package org.apache.bcel.generic;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.Serializable;
-import java.util.Locale;
import org.apache.bcel.Constants;
import org.apache.bcel.classfile.ConstantPool;
import org.apache.bcel.util.ByteSequence;
Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java?rev=947872&r1=947871&r2=947872&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java Tue May 25 00:20:30 2010
@@ -182,7 +182,7 @@ class BCELFactory extends EmptyVisitor {
break;
case Constants.MULTIANEWARRAY:
dim = ((MULTIANEWARRAY) i).getDimensions();
- /* FALL THRU */
+ //$FALL-THROUGH$
case Constants.ANEWARRAY:
case Constants.NEWARRAY:
if (type instanceof ArrayType) {
Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java?rev=947872&r1=947871&r2=947872&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java Tue May 25 00:20:30 2010
@@ -164,7 +164,7 @@ final class CodeHTML implements org.apac
case IF_ICMPLT:
case IF_ICMPNE:
case JSR:
- index = (int) (bytes.getIndex() + bytes.readShort() - 1);
+ index = (bytes.getIndex() + bytes.readShort() - 1);
buf.append("<A HREF=\"#code").append(method_number).append("@").append(index)
.append("\">").append(index).append("</A>");
break;
@@ -387,7 +387,7 @@ final class CodeHTML implements org.apac
.getLocalVariableTable();
for (int j = 0; j < vars.length; j++) {
int start = vars[j].getStartPC();
- int end = (int) (start + vars[j].getLength());
+ int end = (start + vars[j].getLength());
goto_set.set(start);
goto_set.set(end);
}
Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifyDialog.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifyDialog.java?rev=947872&r1=947871&r2=947872&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifyDialog.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifyDialog.java Tue May 25 00:20:30 2010
@@ -81,8 +81,8 @@ public class VerifyDialog extends javax.
if (e.getSource() == VerifyDialog.this.getFlushButton()) {
connEtoC4(e);
}
- };
- };
+ }
+ }
/** Machine-generated. */
private javax.swing.JButton ivjFlushButton = null;
@@ -476,7 +476,7 @@ public class VerifyDialog extends javax.
if (classes_to_verify == 0) {
System.exit(0);
}
- };
+ }
});
aVerifyDialog.setVisible(true);
} catch (Throwable exception) {
Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java?rev=947872&r1=947871&r2=947872&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java Tue May 25 00:20:30 2010
@@ -203,12 +203,12 @@ public class InstConstraintVisitor exten
private void _visitStackAccessor(Instruction o){
int consume = o.consumeStack(cpg); // Stack values are always consumed first; then produced.
if (consume > stack().slotsUsed()){
- constraintViolated((Instruction) o, "Cannot consume "+consume+" stack slots: only "+stack().slotsUsed()+" slot(s) left on stack!\nStack:\n"+stack());
+ constraintViolated(o, "Cannot consume "+consume+" stack slots: only "+stack().slotsUsed()+" slot(s) left on stack!\nStack:\n"+stack());
}
- int produce = o.produceStack(cpg) - ((Instruction) o).consumeStack(cpg); // Stack values are always consumed first; then produced.
+ int produce = o.produceStack(cpg) - o.consumeStack(cpg); // Stack values are always consumed first; then produced.
if ( produce + stack().slotsUsed() > stack().maxStack() ){
- constraintViolated((Instruction) o, "Cannot produce "+produce+" stack slots: only "+(stack().maxStack()-stack().slotsUsed())+" free stack slot(s) left.\nStack:\n"+stack());
+ constraintViolated(o, "Cannot produce "+produce+" stack slots: only "+(stack().maxStack()-stack().slotsUsed())+" free stack slot(s) left.\nStack:\n"+stack());
}
}
@@ -282,7 +282,7 @@ public class InstConstraintVisitor exten
Verifier v = VerifierFactory.getVerifier( name );
VerificationResult vr = v.doPass2();
if (vr.getStatus() != VerificationResult.VERIFIED_OK){
- constraintViolated((Instruction) o, "Class '"+name+"' is referenced, but cannot be loaded and resolved: '"+vr+"'.");
+ constraintViolated(o, "Class '"+name+"' is referenced, but cannot be loaded and resolved: '"+vr+"'.");
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org