You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/09/22 10:28:54 UTC
svn commit: r999801 - in /harmony/enhanced/java/branches/java6: ./ classlib/
classlib/depends/libs/
classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/
classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/
drlvm...
Author: hindessm
Date: Wed Sep 22 08:28:53 2010
New Revision: 999801
URL: http://svn.apache.org/viewvc?rev=999801&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@999306:
r999306 | sjanuary | 2010-09-21 11:47:46 +0100 (Tue, 21 Sep 2010) | 1 line
Pack200 - simplify method calls
Modified:
harmony/enhanced/java/branches/java6/ (props changed)
harmony/enhanced/java/branches/java6/classlib/ (props changed)
harmony/enhanced/java/branches/java6/classlib/depends/libs/ (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/NewAttributeBands.java
harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/NewAttribute.java
harmony/enhanced/java/branches/java6/drlvm/ (props changed)
harmony/enhanced/java/branches/java6/jdktools/ (props changed)
Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 08:28:53 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286
+/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306
/harmony/enhanced/trunk:476395-929252
/incubator/harmony/enhanced/trunk:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 08:28:53 2010
@@ -1,7 +1,7 @@
/harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
/harmony/enhanced/classlib/trunk/working_classlib:884014-884286
/harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286
+/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306
/harmony/enhanced/trunk/classlib:476395-929252
/harmony/enhanced/trunk/working_classlib:476396-920147
/incubator/harmony/enhanced/trunk/classlib:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 08:28:53 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306
/harmony/enhanced/trunk/classlib/depends/libs:476395-929252
/incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394
Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/NewAttributeBands.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/NewAttributeBands.java?rev=999801&r1=999800&r2=999801&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/NewAttributeBands.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/NewAttributeBands.java Wed Sep 22 08:28:53 2010
@@ -729,30 +729,30 @@ public class NewAttributeBands extends B
public void addToAttribute(int n, NewAttribute attribute) {
if (tag.startsWith("KI")) { // Integer
- attribute.addCPConstant(length, ((CPInteger[]) band)[n]);
+ attribute.addToBody(length, ((CPInteger[]) band)[n]);
} else if (tag.startsWith("KJ")) { // Long
- attribute.addCPConstant(length, ((CPLong[]) band)[n]);
+ attribute.addToBody(length, ((CPLong[]) band)[n]);
} else if (tag.startsWith("KF")) { // Float
- attribute.addCPConstant(length, ((CPFloat[]) band)[n]);
+ attribute.addToBody(length, ((CPFloat[]) band)[n]);
} else if (tag.startsWith("KD")) { // Double
- attribute.addCPConstant(length, ((CPDouble[]) band)[n]);
+ attribute.addToBody(length, ((CPDouble[]) band)[n]);
} else if (tag.startsWith("KS")) { // String
- attribute.addCPConstant(length, ((CPString[]) band)[n]);
+ attribute.addToBody(length, ((CPString[]) band)[n]);
} else if (tag.startsWith("RC")) { // Class
- attribute.addCPClass(length, ((CPClass[]) band)[n]);
+ attribute.addToBody(length, ((CPClass[]) band)[n]);
} else if (tag.startsWith("RS")) { // Signature
- attribute.addCPUTF8(length, ((CPUTF8[]) band)[n]);
+ attribute.addToBody(length, ((CPUTF8[]) band)[n]);
} else if (tag.startsWith("RD")) { // Descriptor
- attribute.addCPNameAndType(length, ((CPNameAndType[]) band)[n]);
+ attribute.addToBody(length, ((CPNameAndType[]) band)[n]);
} else if (tag.startsWith("RF")) { // Field Reference
- attribute.addCPFieldRef(length, ((CPFieldRef[]) band)[n]);
+ attribute.addToBody(length, ((CPFieldRef[]) band)[n]);
} else if (tag.startsWith("RM")) { // Method Reference
- attribute.addCPMethodRef(length, ((CPMethodRef[]) band)[n]);
+ attribute.addToBody(length, ((CPMethodRef[]) band)[n]);
} else if (tag.startsWith("RI")) { // Interface Method Reference
- attribute.addCPIMethodRef(length,
+ attribute.addToBody(length,
((CPInterfaceMethodRef[]) band)[n]);
} else if (tag.startsWith("RU")) { // UTF8 String
- attribute.addCPUTF8(length, ((CPUTF8[]) band)[n]);
+ attribute.addToBody(length, ((CPUTF8[]) band)[n]);
}
}
Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/NewAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/NewAttribute.java?rev=999801&r1=999800&r2=999801&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/NewAttribute.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/NewAttribute.java Wed Sep 22 08:28:53 2010
@@ -113,39 +113,9 @@ public class NewAttribute extends BCIRen
body.add(new BCLength(value));
}
- public void addCPConstant(int length, CPConstant constant) {
+ public void addToBody(int length, Object value) {
lengths.add(new Integer(length));
- body.add(constant);
- }
-
- public void addCPClass(int length, CPClass class1) {
- lengths.add(new Integer(length));
- body.add(class1);
- }
-
- public void addCPUTF8(int length, CPUTF8 cputf8) {
- lengths.add(new Integer(length));
- body.add(cputf8);
- }
-
- public void addCPNameAndType(int length, CPNameAndType type) {
- lengths.add(new Integer(length));
- body.add(type);
- }
-
- public void addCPFieldRef(int length, CPFieldRef ref) {
- lengths.add(new Integer(length));
- body.add(ref);
- }
-
- public void addCPMethodRef(int length, CPMethodRef ref) {
- lengths.add(new Integer(length));
- body.add(ref);
- }
-
- public void addCPIMethodRef(int length, CPInterfaceMethodRef ref) {
- lengths.add(new Integer(length));
- body.add(ref);
+ body.add(value);
}
protected void resolve(ClassConstantPool pool) {
Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 08:28:53 2010
@@ -1,5 +1,5 @@
/harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286
+/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306
/harmony/enhanced/trunk/drlvm:476395-929252
/harmony/enhanced/trunk/working_vm:476396-920147
/incubator/harmony/enhanced/trunk/drlvm:292550-476394
Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 08:28:53 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286
+/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306
/harmony/enhanced/jdktools/trunk:630107-925933
/harmony/enhanced/trunk/jdktools:476395-929252
/harmony/enhanced/trunk/working_jdktools:476396-920147