Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Patch bcel so that it'll compile under Java 1.5. Part of Greg's work
to help get tomcat5 to fully compile under Java 1.5. Thanks Greg! Submitted by: Greg Kick; gkick at ucla.edu Reviewed by: jberry Approved by: jberry Obtained from: Greg Kick git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@15061 d073be05-634f-4543-b044-5fe20cf6d1d6
- Loading branch information
Showing
3 changed files
with
54 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
--- ./src/java/org/apache/bcel/verifier/statics/Pass2Verifier.java 2003-04-25 10:06:16.000000000 -0700 | ||
+++ ./src-fix/java/org/apache/bcel/verifier/statics/Pass2Verifier.java 2005-11-17 23:58:06.000000000 -0800 | ||
@@ -345,7 +345,7 @@ | ||
|
||
for (int i=0; i<atts.length; i++){ | ||
if ((! (atts[i] instanceof SourceFile)) && | ||
- (! (atts[i] instanceof Deprecated)) && | ||
+ (! (atts[i] instanceof org.apache.bcel.classfile.Deprecated)) && | ||
(! (atts[i] instanceof InnerClasses)) && | ||
(! (atts[i] instanceof Synthetic))){ | ||
addMessage("Attribute '"+tostring(atts[i])+"' as an attribute of the ClassFile structure '"+tostring(obj)+"' is unknown and will therefore be ignored."); | ||
@@ -519,7 +519,7 @@ | ||
for (int i=0; i<atts.length; i++){ | ||
if ((! (atts[i] instanceof ConstantValue)) && | ||
(! (atts[i] instanceof Synthetic)) && | ||
- (! (atts[i] instanceof Deprecated))){ | ||
+ (! (atts[i] instanceof org.apache.bcel.classfile.Deprecated))){ | ||
addMessage("Attribute '"+tostring(atts[i])+"' as an attribute of Field '"+tostring(obj)+"' is unknown and will therefore be ignored."); | ||
} | ||
if (! (atts[i] instanceof ConstantValue)){ | ||
@@ -660,7 +660,7 @@ | ||
if ((! (atts[i] instanceof Code)) && | ||
(! (atts[i] instanceof ExceptionTable)) && | ||
(! (atts[i] instanceof Synthetic)) && | ||
- (! (atts[i] instanceof Deprecated))){ | ||
+ (! (atts[i] instanceof org.apache.bcel.classfile.Deprecated))){ | ||
addMessage("Attribute '"+tostring(atts[i])+"' as an attribute of Method '"+tostring(obj)+"' is unknown and will therefore be ignored."); | ||
} | ||
if ((! (atts[i] instanceof Code)) && | ||
@@ -702,7 +702,7 @@ | ||
addMessage("SourceFile attribute '"+tostring(obj)+"' has a funny name: remember not to confuse certain parsers working on javap's output. Also, this name ('"+sourcefilename+"') is considered an unqualified (simple) file name only."); | ||
} | ||
} | ||
- public void visitDeprecated(Deprecated obj){//vmspec2 4.7.10 | ||
+ public void visitDeprecated(org.apache.bcel.classfile.Deprecated obj){//vmspec2 4.7.10 | ||
checkIndex(obj, obj.getNameIndex(), CONST_Utf8); | ||
|
||
String name = ((ConstantUtf8) cp.getConstant(obj.getNameIndex())).getBytes(); |
11 changes: 11 additions & 0 deletions
11
java/jakarta-bcel/files/patch-StringRepresentation.java.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- ./src/java/org/apache/bcel/verifier/statics/StringRepresentation.java 2003-04-25 10:06:16.000000000 -0700 | ||
+++ ./src-fix/java/org/apache/bcel/verifier/statics/StringRepresentation.java 2005-11-17 23:58:06.000000000 -0800 | ||
@@ -172,7 +172,7 @@ | ||
public void visitConstantValue(ConstantValue obj){ | ||
tostring = toString(obj); | ||
} | ||
- public void visitDeprecated(Deprecated obj){ | ||
+ public void visitDeprecated(org.apache.bcel.classfile.Deprecated obj){ | ||
tostring = toString(obj); | ||
} | ||
public void visitExceptionTable(ExceptionTable obj){ |