harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ton...@apache.org
Subject svn commit: r617085 [13/14] - in /harmony/enhanced/classlib/branches/java6: depends/build/ depends/build/platform/ depends/libs/ depends/oss/ make/ make/linux.x86_64.libstdc++6/ make/windows.x86/ make/windows.x86_64/ modules/archive/META-INF/ modules/a...
Date Thu, 31 Jan 2008 10:04:22 GMT
Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ClassPoolSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ClassPoolSet.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ClassPoolSet.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ClassPoolSet.java Thu Jan 31 02:04:05 2008
@@ -25,6 +25,8 @@
 /**
  * This class implements the special set (which is aware of
  * domains) used when generating ClassConstantPools.
+ * It's called a Set, but isn't quite a Collection - it
+ * doesn't implement all the API required.
  */
 public class ClassPoolSet {
 
@@ -32,7 +34,7 @@
         /* (non-Javadoc)
          * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
          */
-        public int compare(Object o1, Object o2) {            
+        public int compare(Object o1, Object o2) {
             if(o1.equals(o2)) {
                 return 0;
             }
@@ -53,7 +55,7 @@
             // with this comparator, it is an error.
             ConstantPoolEntry cpe1 = (ConstantPoolEntry)o1;
             ConstantPoolEntry cpe2 = (ConstantPoolEntry)o2;
-            
+
             // Domains must be the same, need to compare
             // based on comparisonString.
             String compare1 = cpe1.comparisonString();
@@ -71,7 +73,7 @@
             if(classCompare != 0) {
                 return classCompare;
             }
-            
+
             // Now that we've reached this point, we're
             // comparing objects of the same class. Since
             // they have the same class, we can make the
@@ -96,7 +98,7 @@
             if(classCompare != 0) {
                 return classCompare;
             }
-            
+
             // Now that we've reached this point, we're
             // comparing objects of the same class. Since
             // they have the same class, we can make the
@@ -130,13 +132,13 @@
         comparators[ClassConstantPool.DOMAIN_FIELD] = new PoolComparator();
         comparators[ClassConstantPool.DOMAIN_METHOD] = new PoolComparator();
         comparators[ClassConstantPool.DOMAIN_ATTRIBUTEASCIIZ] = new NormalAsciizComparator();
-        
+
         for(int index=0; index < ClassConstantPool.NUM_DOMAINS; index++) {
             sets[index] = new TreeSet(comparators[index]);
         }
     }
-    
-    
+
+
     /**
      * Answer the index of the first set which contains the entry
      * passed in as the parameter.
@@ -151,7 +153,7 @@
         }
         return -1;
     }
-    
+
     /**
      * @param set
      * @param testEntry
@@ -176,7 +178,7 @@
      * that. If the parameter exists in a lower precedence
      * domain, remove it from the lower domain and add it to
      * the higher one.
-     * 
+     *
      * @param entry ConstantPoolEntry to add
      * @return ConstantPoolEntry from the domain where it's stored
      */
@@ -184,13 +186,13 @@
         ConstantPoolEntry cpEntry = (ConstantPoolEntry)entry;
         int entryDomain = cpEntry.getDomain();
         int currentStoredDomain = findFirstSetContaining(cpEntry);
-        
+
         if(currentStoredDomain < 0) {
             // Entry is not currently stored; just store it.
             sets[entryDomain].add(cpEntry);
             return cpEntry;
         }
-        
+
         if(currentStoredDomain <= entryDomain) {
             // Entry is either already in this place
             // or in a higher-precedence (numerically lower)
@@ -198,7 +200,7 @@
             // domain.
             return getStoredEntry(currentStoredDomain, cpEntry);
         }
-        
+
         // Entry is in a lower-precedence (numerically higher)
         // domain. Need to remove it from the lower-precedence
         // domain and add it to the higher precedence domain.
@@ -228,6 +230,6 @@
         for(int index=start; index <= stop; index++) {
             someElements.addAll(sets[index]);
         }
-        return someElements.iterator();        
+        return someElements.iterator();
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CodeAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CodeAttribute.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CodeAttribute.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CodeAttribute.java Thu Jan 31 02:04:05 2008
@@ -84,7 +84,7 @@
             byteCode.applyByteCodeTargetFixup(this);
         }
         // TODO: By the time I get here, the input stream
-        // is somehow confused. 
+        // is somehow confused.
     }
 
     protected int getLength() {
@@ -125,7 +125,7 @@
         }
         for (Iterator iter = exceptionTable.iterator(); iter.hasNext();) {
             ExceptionTableEntry entry = (ExceptionTableEntry) iter.next();
-            entry.resolve(pool);            
+            entry.resolve(pool);
         }
     }
 
@@ -160,7 +160,7 @@
     public void addAttribute(Attribute attribute) {
         attributes.add(attribute);
     }
-    
+
     public List attributes() {
         return attributes;
     }
@@ -173,7 +173,7 @@
     public void renumber(List byteCodeOffsets) {
         for (Iterator iter = exceptionTable.iterator(); iter.hasNext();) {
             ExceptionTableEntry entry = (ExceptionTableEntry) iter.next();
-            entry.renumber(byteCodeOffsets);            
+            entry.renumber(byteCodeOffsets);
         }
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ConstantPoolEntry.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ConstantPoolEntry.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ConstantPoolEntry.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ConstantPoolEntry.java Thu Jan 31 02:04:05 2008
@@ -20,7 +20,7 @@
 import java.io.IOException;
 
 /**
- * 
+ *
  */
 public abstract class ConstantPoolEntry extends ClassFileEntry {
 	public static final byte CP_Class = 7;
@@ -35,9 +35,9 @@
 
 	/*
 	 * class MemberRef extends ConstantPoolEntry { private int index;
-	 * 
+	 *
 	 * Class(String name) { super(CP_Class); index = pool.indexOf(name); }
-	 * 
+	 *
 	 * void writeBody(DataOutputStream dos) throws IOException {
 	 * dos.writeShort(index); } }
 	 */
@@ -76,11 +76,11 @@
 	public int getDomain() {
 	    return domain;
 	}
-	
+
 	public void setDomain(int newDomain) {
 	    this.domain = newDomain;
 	}
-	
+
 	public abstract int hashCode();
 
 	public void doWrite(DataOutputStream dos) throws IOException {

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ConstantValueAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ConstantValueAttribute.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ConstantValueAttribute.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ConstantValueAttribute.java Thu Jan 31 02:04:05 2008
@@ -41,7 +41,7 @@
 		}
 	}
 
-	
+
 	public boolean equals(Object obj) {
 		if (this == obj)
 			return true;
@@ -58,7 +58,7 @@
 		return true;
 	}
 
-	
+
 	protected int getLength() {
 		return 2;
 	}
@@ -67,7 +67,7 @@
 		return new ClassFileEntry[] { getAttributeName(), entry };
 	}
 
-	
+
 	public int hashCode() {
 		final int PRIME = 31;
 		int result = super.hashCode();
@@ -85,7 +85,7 @@
 		return "Constant:" + entry;
 	}
 
-	
+
 	protected void writeBody(DataOutputStream dos) throws IOException {
 		dos.writeShort(constantIndex);
 	}

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/EnclosingMethodAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/EnclosingMethodAttribute.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/EnclosingMethodAttribute.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/EnclosingMethodAttribute.java Thu Jan 31 02:04:05 2008
@@ -38,7 +38,7 @@
     protected int getLength() {
         return 4;
     }
-    
+
     protected void resolve(ClassConstantPool pool) {
         super.resolve(pool);
         cpClass.resolve(pool);

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ExceptionTableEntry.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ExceptionTableEntry.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ExceptionTableEntry.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ExceptionTableEntry.java Thu Jan 31 02:04:05 2008
@@ -25,7 +25,7 @@
     private int startPC;
     private int endPC;
     private int handlerPC;
-    private CPClass catchType;    
+    private CPClass catchType;
 
     private int startPcRenumbered;
     private int endPcRenumbered;
@@ -45,7 +45,7 @@
 		dos.writeShort(handlerPcRenumbered);
 		dos.writeShort(catchTypeIndex);
 	}
-    
+
     public void renumber(List byteCodeOffsets) {
         startPcRenumbered = ((Integer)byteCodeOffsets.get(startPC)).intValue();
         int endPcIndex = startPC + endPC;
@@ -53,7 +53,7 @@
         int handlerPcIndex = endPcIndex + handlerPC;
         handlerPcRenumbered = ((Integer)byteCodeOffsets.get(handlerPcIndex)).intValue();
     }
-    
+
     public void resolve(ClassConstantPool pool) {
         catchType.resolve(pool);
         catchTypeIndex = pool.indexOf(catchType);

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ExceptionsAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ExceptionsAttribute.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ExceptionsAttribute.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ExceptionsAttribute.java Thu Jan 31 02:04:05 2008
@@ -44,7 +44,7 @@
 		this.exceptions = exceptions;
 	}
 
-	
+
 	public boolean equals(Object obj) {
 		if (this == obj)
 			return true;
@@ -58,7 +58,7 @@
 		return true;
 	}
 
-	
+
 	protected int getLength() {
 		return 2 + 2 * exceptions.length;
 	}
@@ -68,11 +68,11 @@
 		for (int i = 0; i < exceptions.length; i++) {
 			result[i] = exceptions[i];
 		}
-		result[exceptions.length] = getAttributeName(); 
+		result[exceptions.length] = getAttributeName();
 		return result;
 	}
 
-	
+
 	public int hashCode() {
 		final int prime = 31;
 		int result = super.hashCode();
@@ -93,7 +93,7 @@
 		return "Exceptions:" + exceptions;
 	}
 
-	
+
 	protected void writeBody(DataOutputStream dos) throws IOException {
 		dos.writeShort(exceptionIndexes.length);
 		for (int i = 0; i < exceptionIndexes.length; i++) {

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/LineNumberTableAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/LineNumberTableAttribute.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/LineNumberTableAttribute.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/LineNumberTableAttribute.java Thu Jan 31 02:04:05 2008
@@ -24,7 +24,7 @@
     private int line_number_table_length;
     private int[] start_pcs;
     private int[] line_numbers;
-    
+
     public LineNumberTableAttribute(int line_number_table_length, int[] start_pcs, int[] line_numbers) {
         super("LineNumberTable");
         this.line_number_table_length = line_number_table_length;
@@ -57,7 +57,7 @@
     protected ClassFileEntry[] getNestedClassFileEntries() {
         return new ClassFileEntry[] {getAttributeName()};
     }
-    
+
 	/* (non-Javadoc)
 	 * @see org.apache.harmony.pack200.bytecode.Attribute#resolve(org.apache.harmony.pack200.bytecode.ClassConstantPool)
 	 */

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/LocalVariableTableAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/LocalVariableTableAttribute.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/LocalVariableTableAttribute.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/LocalVariableTableAttribute.java Thu Jan 31 02:04:05 2008
@@ -70,9 +70,9 @@
         ClassFileEntry[] nestedEntryArray = new ClassFileEntry[nestedEntries
                 .size()];
         nestedEntries.toArray(nestedEntryArray);
-        return nestedEntryArray;        
+        return nestedEntryArray;
     }
-    
+
     protected void resolve(ClassConstantPool pool) {
         super.resolve(pool);
         name_indexes = new int[local_variable_table_length];
@@ -84,7 +84,7 @@
             descriptor_indexes[i] = pool.indexOf(descriptors[i]);
         }
     }
-    
+
     public String toString() {
         return "LocalVariableTable: " + + local_variable_table_length + " variables";
     }
@@ -115,20 +115,20 @@
         // First figure out the maximum size of the byteCodeOffsets array
         int lastInstruction = ((Integer)byteCodeOffsets.get(byteCodeOffsets.size() - 1)).intValue();
         int maxSize = lastInstruction + 1;
-        
+
         // Iterate through the lengths and update each in turn.
         // This is done in place in the lengths array.
         for(int index=0; index < lengths.length; index++) {
             int start_pc = start_pcs[index];
             int revisedLength = -1;
             int encodedLength = lengths[index];
-            
+
             // First get the index of the start_pc in the byteCodeOffsets
             int indexOfStartPC = unrenumbered_start_pcs[index];
             // Given the index of the start_pc, we can now add
             // the encodedLength to it to get the stop index.
             int stopIndex = indexOfStartPC + encodedLength;
-            
+
             // Length can either be an index into the byte code offsets, or one beyond the
             // end of the byte code offsets. Need to determine which this is.
             if(stopIndex == byteCodeOffsets.size()) {
@@ -137,7 +137,7 @@
             } else {
                 // We're indexed into the byte code array
                 int stopValue = ((Integer)byteCodeOffsets.get(stopIndex)).intValue();
-                revisedLength = stopValue - start_pc;                
+                revisedLength = stopValue - start_pc;
             }
             lengths[index] = revisedLength;
         }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/LocalVariableTypeTableAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/LocalVariableTypeTableAttribute.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/LocalVariableTypeTableAttribute.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/LocalVariableTypeTableAttribute.java Thu Jan 31 02:04:05 2008
@@ -69,7 +69,7 @@
             signature_indexes[i] = pool.indexOf(signatures[i]);
         }
     }
-    
+
     public String toString() {
         return "LocalVariableTypeTable: " + + local_variable_type_table_length + " varaibles";
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/NewAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/NewAttribute.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/NewAttribute.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/NewAttribute.java Thu Jan 31 02:04:05 2008
@@ -26,7 +26,7 @@
  * A New (i.e. non-predefined) Class File attribute
  */
 public class NewAttribute extends BCIRenumberedAttribute {
-    
+
     private List lengths = new ArrayList(); // List of Integers
     private List body = new ArrayList();
     private ClassConstantPool pool;
@@ -135,20 +135,20 @@
         lengths.add(new Integer(length));
         body.add(ref);
     }
-    
+
     protected void resolve(ClassConstantPool pool) {
         super.resolve(pool);
         for (Iterator iter = body.iterator(); iter.hasNext();) {
-            Object element = (Object) iter.next();
+            Object element = iter.next();
             if(element instanceof ClassFileEntry) {
                 ((ClassFileEntry)element).resolve(pool);
             }
         }
         this.pool = pool;
     }
-    
+
     private static class BCOffset extends BCValue {
-        
+
         private int offset;
         private int index;
 
@@ -161,9 +161,9 @@
         }
 
     }
-    
+
     private static class BCIndex extends BCValue {
-        
+
         private int index;
 
         public BCIndex(int index) {
@@ -172,14 +172,14 @@
     }
 
     private static class BCLength extends BCValue {
-        
+
         private int length;
 
         public BCLength(int length) {
             this.length = length;
         }
     }
-    
+
     // Bytecode-related value (either a bytecode index or a length)
     private static abstract class BCValue {
 
@@ -195,12 +195,12 @@
         // Don't need to return anything here as we've overridden renumber
         return null;
     }
-    
+
     public void renumber(List byteCodeOffsets) {
         if(!renumbered) {
             Object previous = null;
             for (Iterator iter = body.iterator(); iter.hasNext();) {
-                Object obj = (Object) iter.next();
+                Object obj = iter.next();
                 if(obj instanceof BCIndex) {
                     BCIndex bcIndex = (BCIndex) obj;
                     bcIndex.setActualValue(((Integer)byteCodeOffsets.get(bcIndex.index)).intValue());
@@ -209,14 +209,14 @@
                     if(previous instanceof BCIndex) {
                         int index = ((BCIndex)previous).index + bcOffset.offset;
                         bcOffset.setIndex(index);
-                        bcOffset.setActualValue(((Integer)byteCodeOffsets.get(index)).intValue()); 
+                        bcOffset.setActualValue(((Integer)byteCodeOffsets.get(index)).intValue());
                     } else if(previous instanceof BCOffset) {
                         int index = ((BCOffset)previous).index + bcOffset.offset;
                         bcOffset.setIndex(index);
-                        bcOffset.setActualValue(((Integer)byteCodeOffsets.get(index)).intValue()); 
+                        bcOffset.setActualValue(((Integer)byteCodeOffsets.get(index)).intValue());
                     } else {
                         // Not sure if this should be able to happen
-                        bcOffset.setActualValue(((Integer)byteCodeOffsets.get(bcOffset.offset)).intValue());  
+                        bcOffset.setActualValue(((Integer)byteCodeOffsets.get(bcOffset.offset)).intValue());
                     }
                 } else if (obj instanceof BCLength) {
                     // previous must be a BCIndex
@@ -224,7 +224,7 @@
                     BCIndex prevIndex = (BCIndex) previous;
                     int index = prevIndex.index + bcLength.length;
                     int actualLength = ((Integer)byteCodeOffsets.get(index)).intValue() - prevIndex.actualValue;
-                    bcLength.setActualValue(actualLength);  
+                    bcLength.setActualValue(actualLength);
                 }
                 previous = obj;
             }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/OperandManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/OperandManager.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/OperandManager.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/OperandManager.java Thu Jan 31 02:04:05 2008
@@ -27,7 +27,7 @@
  * in super, this and new references.
  */
 public class OperandManager {
-	
+
     int[] bcCaseCount;
     int[] bcCaseValue;
     int[] bcByte;
@@ -49,7 +49,7 @@
 	int[] bcSuperMethod;
 	int[] bcInitRef;
 	int[] wideByteCodes;
-    
+
 	int bcCaseCountIndex = 0;
 	int bcCaseValueIndex = 0;
 	int bcByteIndex = 0;
@@ -71,13 +71,13 @@
 	int bcSuperMethodIndex = 0;
 	int bcInitRefIndex = 0;
 	int wideByteCodeIndex = 0;
-    
+
 	Segment segment = null;
-	
+
 	String currentClass = null;
 	String superClass = null;
 	String newClass = null;
-	
+
 	public OperandManager(int[] bcCaseCount, int[] bcCaseValue, int[] bcByte, int[]  bcShort, int[]  bcLocal, int[]  bcLabel, int[]  bcIntRef, int[]  bcFloatRef, int[]  bcLongRef, int[]  bcDoubleRef, int[]  bcStringRef, int[]  bcClassRef, int[]  bcFieldRef, int[]  bcMethodRef, int[] bcIMethodRef, int[] bcThisField, int[] bcSuperField, int[] bcThisMethod, int[] bcSuperMethod, int[] bcInitRef, int[] wideByteCodes) {
 	    this.bcCaseCount = bcCaseCount;
 	    this.bcCaseValue = bcCaseValue;
@@ -102,67 +102,67 @@
 	    this.bcInitRef = bcInitRef;
 	    this.wideByteCodes = wideByteCodes;
 	}
-    
+
     public int nextCaseCount() {
-        return bcCaseCount[bcCaseCountIndex++];       
+        return bcCaseCount[bcCaseCountIndex++];
     }
-    
+
     public int nextCaseValues() {
-        return bcCaseValue[bcCaseValueIndex++];       
+        return bcCaseValue[bcCaseValueIndex++];
     }
-    
+
 	public int nextByte() {
-		return bcByte[bcByteIndex++];		
+		return bcByte[bcByteIndex++];
 	}
-	
+
 	public int nextShort() {
-		return bcShort[bcShortIndex++];		
+		return bcShort[bcShortIndex++];
 	}
-	
+
 	public int nextLocal() {
-		return bcLocal[bcLocalIndex++];		
+		return bcLocal[bcLocalIndex++];
 	}
-	
+
 	public int nextLabel() {
-		return bcLabel[bcLabelIndex++];		
+		return bcLabel[bcLabelIndex++];
 	}
-	
+
 	public int nextIntRef() {
-		return bcIntRef[bcIntRefIndex++];		
+		return bcIntRef[bcIntRefIndex++];
 	}
-	
+
 	public int nextFloatRef() {
-		return bcFloatRef[bcFloatRefIndex++];		
+		return bcFloatRef[bcFloatRefIndex++];
 	}
-	
+
 	public int nextLongRef() {
-		return bcLongRef[bcLongRefIndex++];		
+		return bcLongRef[bcLongRefIndex++];
 	}
-	
+
 	public int nextDoubleRef() {
-		return bcDoubleRef[bcDoubleRefIndex++];		
+		return bcDoubleRef[bcDoubleRefIndex++];
 	}
-	
+
 	public int nextStringRef() {
-		return bcStringRef[bcStringRefIndex++];		
+		return bcStringRef[bcStringRefIndex++];
 	}
-	
+
 	public int nextClassRef() {
-		return bcClassRef[bcClassRefIndex++];		
+		return bcClassRef[bcClassRefIndex++];
 	}
-	
+
 	public int nextFieldRef() {
-		return bcFieldRef[bcFieldRefIndex++];		
+		return bcFieldRef[bcFieldRefIndex++];
 	}
-	
+
 	public int nextMethodRef() {
-		return bcMethodRef[bcMethodRefIndex++];		
+		return bcMethodRef[bcMethodRefIndex++];
 	}
-	
+
 	public int nextIMethodRef() {
-		return bcIMethodRef[bcIMethodRefIndex++];		
+		return bcIMethodRef[bcIMethodRefIndex++];
 	}
-	
+
 	public int nextThisFieldRef() {
 		return bcThisField[bcThisFieldIndex++];
 	}
@@ -186,18 +186,18 @@
 	public int nextWideByteCode() {
 	    return wideByteCodes[wideByteCodeIndex++];
 	}
-	
+
 	public void setSegment(Segment segment) {
 		this.segment = segment;
 	}
 	public Segment getSegment() {
 		return segment;
 	}
-	
+
 	public SegmentConstantPool globalConstantPool() {
 		return segment.getConstantPool();
 	}
-	
+
 	public void setCurrentClass(String string) {
 		currentClass = string;
 	}
@@ -207,7 +207,7 @@
 	public void setNewClass(String string) {
 		newClass = string;
 	}
-	
+
 	public String getCurrentClass() {
 		if(null==currentClass) {
 			throw new Error("Current class not set yet");

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/RuntimeVisibleorInvisibleParameterAnnotationsAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/RuntimeVisibleorInvisibleParameterAnnotationsAttribute.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/RuntimeVisibleorInvisibleParameterAnnotationsAttribute.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/RuntimeVisibleorInvisibleParameterAnnotationsAttribute.java Thu Jan 31 02:04:05 2008
@@ -57,10 +57,10 @@
     public String toString() {
         return name + ": " + num_parameters + " parameter annotations";
     }
-    
+
 
     public static class ParameterAnnotation {
-        
+
         private Annotation[] annotations;
         private int num_annotations;
 

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/SignatureAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/SignatureAttribute.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/SignatureAttribute.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/SignatureAttribute.java Thu Jan 31 02:04:05 2008
@@ -20,7 +20,7 @@
 import java.io.IOException;
 
 public class SignatureAttribute extends Attribute {
-    
+
     private int signature_index;
     private CPUTF8 signature;
 
@@ -41,7 +41,7 @@
         signature.resolve(pool);
         signature_index = pool.indexOf(signature);
     }
-    
+
     /* (non-Javadoc)
      * @see org.apache.harmony.pack200.bytecode.Attribute#writeBody(java.io.DataOutputStream)
      */

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ByteCodeForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ByteCodeForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ByteCodeForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ByteCodeForm.java Thu Jan 31 02:04:05 2008
@@ -56,9 +56,9 @@
     protected static final int TYPE_SUPERINITMETHODREF=23;
     protected static final int TYPE_NEWINITMETHODREF=24;
     protected static final int TYPE_NEWCLASSREF=25;
-    
+
     protected static final boolean WIDENED = true;
-    
+
     protected static final Map byteCodes = new HashMap();
     static {
         ByteCodeForm[] byteCodeArray = new ByteCodeForm[256];
@@ -285,7 +285,7 @@
         byteCodeArray[218] = new SuperFieldRefForm(218, "getfield_super", new int[] {180, -1, -1});
         byteCodeArray[219] = new SuperFieldRefForm(219, "putfield_super", new int[] {181, -1, -1});
         byteCodeArray[220] = new SuperMethodRefForm(220, "invokevirtual_super", new int[] {182, -1, -1});
-        byteCodeArray[221] = new SuperFieldRefForm(221, "invokespecial_super", new int[] {183, -1, -1});
+        byteCodeArray[221] = new SuperMethodRefForm(221, "invokespecial_super", new int[] {183, -1, -1});
         byteCodeArray[222] = new SuperMethodRefForm(222, "invokestatic_super", new int[] {184, -1, -1});
         byteCodeArray[223] = new SuperFieldRefForm(223, "aload_0_getstatic_super", new int[] {42, 178, -1, -1});
         byteCodeArray[224] = new SuperFieldRefForm(224, "aload_0_putstatic_super", new int[] {42, 179, -1, -1});
@@ -297,14 +297,14 @@
         byteCodeArray[230] = new ThisInitMethodRefForm(230, "invokespecial_this_init", new int[] {183, -1, -1});
         byteCodeArray[231] = new SuperInitMethodRefForm(231, "invokespecial_super_init", new int[] {183, -1, -1});
         byteCodeArray[232] = new NewInitMethodRefForm(232, "invokespecial_new_init", new int[] {183, -1, -1});
-        byteCodeArray[233] = new NarrowClassRefForm(233, "cldc", new int[] {18, -1}); 
+        byteCodeArray[233] = new NarrowClassRefForm(233, "cldc", new int[] {18, -1});
         byteCodeArray[234] = new IntRefForm(234, "ildc", new int[] {18, -1});
         byteCodeArray[235] = new FloatRefForm(235, "fldc", new int[] {18, -1});
         byteCodeArray[236] = new NarrowClassRefForm(236, "cldc_w", new int[] {19, -1, -1}, WIDENED);
         byteCodeArray[237] = new IntRefForm(237, "ildc_w", new int[] {19, -1, -1}, WIDENED);
         byteCodeArray[238] = new FloatRefForm(238, "fldc_w", new int[] {19, -1, -1}, WIDENED);
         byteCodeArray[239] = new DoubleForm(239, "dldc2_w", new int[] {20, -1, -1});
-        
+
         // Reserved bytecodes
         byteCodeArray[254] = new NoArgumentForm(254, "impdep1");
         byteCodeArray[255] = new NoArgumentForm(255, "impdep2");
@@ -312,7 +312,7 @@
         // Bytecodes that aren't defined in the spec but are useful when
         // unpacking (all must be >255)
         // maybe wide versions of the others? etc.
-        
+
         // Put all the bytecodes in a HashMap so we can
         // get them by either name or number
         for (int i = 0; i < byteCodeArray.length; i++) {
@@ -323,13 +323,13 @@
             }
         }
     }
-    
+
     private final int opcode;
     private final String name;
     private final int[] rewrite;
     private int firstOperandIndex;
     private int operandLength;
-    
+
     /**
      * Answer a new instance of this class with the specified
      * opcode and name. Assume no rewrite.
@@ -339,7 +339,7 @@
     public ByteCodeForm(int opcode, String name) {
         this(opcode, name, new int[]{opcode});
     }
-    
+
     /**
      * Answer a new instance of this class with the specified
      * opcode, name, operandType and rewrite
@@ -358,7 +358,7 @@
     protected void calculateOperandPosition() {
         firstOperandIndex = -1;
         operandLength = -1;
-        
+
         // Find the first negative number in the rewrite array
         int iterationIndex = 0;
         while (iterationIndex < rewrite.length) {
@@ -395,19 +395,19 @@
         }
         operandLength = difference + 1;
     }
-    
+
     public static ByteCodeForm get(int opcode) {
         return (ByteCodeForm)byteCodes.get(new Integer(opcode));
     }
-    
+
     public static ByteCodeForm get(String name) {
         return (ByteCodeForm)byteCodes.get(name);
     }
-    
+
     public String toString() {
         return this.getClass().getName() + "(" + getName() + ":" + getOperandType() + ")";
     }
-    
+
     public int getOpcode() {
         return opcode;
     }
@@ -419,21 +419,21 @@
     public int getOperandType() {
         return -1;
     }
-    
+
     public int[] getRewrite() {
         return rewrite;
     }
-    
+
     public int[] getRewriteCopy() {
         int[] result = new int[rewrite.length];
         System.arraycopy(rewrite, 0, result, 0, rewrite.length);
         return result;
     }
-    
+
     public int firstOperandIndex() {
         return firstOperandIndex;
     }
-    
+
     public int operandLength() {
         return operandLength;
     }
@@ -441,7 +441,7 @@
     public boolean hasNoOperand() {
         return false;
     }
-    
+
     public boolean hasByteOperand() {
         return false;
     }
@@ -537,18 +537,18 @@
     public boolean hasNewInitMethodRefOperand() {
         return false;
     }
-    
+
     public boolean hasInitMethodRefOperand() {
         return false;
     }
 
-    
+
     /**
      * This method will answer true if the receiver is
      * a multi-bytecode instruction (such as
      * aload0_putfield_super); otherwise, it will answer
      * false.
-     * 
+     *
      * @return boolean true if multibytecode, false otherwise
      */
     public boolean hasMultipleByteCodes() {
@@ -564,12 +564,12 @@
     	}
     	return false;
     }
-    
+
     /**
      * When passed a byteCode, an OperandTable and a
      * SegmentConstantPool, this method will set the
      * rewrite of the byteCode appropriately.
-     * 
+     *
      * @param byteCode ByteCode to be updated (!)
      * @param operandManager OperandTable from which to draw info
      * @param codeLength Length of bytes (excluding this bytecode)
@@ -579,7 +579,7 @@
      */
     public void setByteCodeOperands(ByteCode byteCode,
             OperandManager operandManager, int codeLength) {
-        throw new Error("My subclass should have implemented this");        
+        throw new Error("My subclass should have implemented this");
     }
 
     /**

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassRefForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassRefForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassRefForm.java Thu Jan 31 02:04:05 2008
@@ -27,7 +27,7 @@
 public class ClassRefForm extends ReferenceForm {
 
     protected boolean widened = false;
-    
+
     public ClassRefForm(int opcode, String name, int[] rewrite) {
         super(opcode, name, rewrite);
         // TODO Auto-generated constructor stub

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassSpecificReferenceForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassSpecificReferenceForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassSpecificReferenceForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassSpecificReferenceForm.java Thu Jan 31 02:04:05 2008
@@ -36,11 +36,11 @@
         super(opcode, name, rewrite);
         // TODO Auto-generated constructor stub
     }
-    
+
     protected abstract int getOffset(OperandManager operandManager);
     protected abstract int getPoolID();
     protected abstract String context(OperandManager operandManager);
-    
+
     protected void setNestedEntries(ByteCode byteCode, OperandManager operandManager, int offset) throws Pack200Exception {
         SegmentConstantPool globalPool = operandManager.globalConstantPool();
         ClassFileEntry[] nested = null;

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/DoubleForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/DoubleForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/DoubleForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/DoubleForm.java Thu Jan 31 02:04:05 2008
@@ -25,7 +25,7 @@
  * double references).
  */
 public class DoubleForm extends ReferenceForm {
-    
+
     public DoubleForm(int opcode, String name, int[] rewrite) {
         super(opcode, name, rewrite);
         // TODO Auto-generated constructor stub
@@ -34,7 +34,7 @@
     public int getOperandType() {
         return TYPE_DOUBLE;
     }
-    
+
     public boolean hasDoubleOperand() {
         return true;
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/FieldRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/FieldRefForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/FieldRefForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/FieldRefForm.java Thu Jan 31 02:04:05 2008
@@ -34,7 +34,7 @@
     public int getOperandType() {
         return TYPE_FIELDREF;
     }
-    
+
     public boolean hasFieldRefOperand() {
         return true;
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IMethodRefForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IMethodRefForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IMethodRefForm.java Thu Jan 31 02:04:05 2008
@@ -28,7 +28,7 @@
  */
 public class IMethodRefForm extends ReferenceForm {
 
-    public IMethodRefForm(int opcode, String name, 
+    public IMethodRefForm(int opcode, String name,
             int[] rewrite) {
         super(opcode, name, rewrite);
     }
@@ -48,7 +48,7 @@
     protected int getPoolID() {
         return SegmentConstantPool.CP_IMETHOD;
     }
-    
+
     /* (non-Javadoc)
      * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode, org.apache.harmony.pack200.bytecode.OperandTable, org.apache.harmony.pack200.Segment)
      */

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IincForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IincForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IincForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IincForm.java Thu Jan 31 02:04:05 2008
@@ -33,7 +33,7 @@
     public int getOperandType() {
         return TYPE_IINC;
     }
-    
+
     public boolean hasIincOperand() {
         return true;
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/InitMethodReferenceForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/InitMethodReferenceForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/InitMethodReferenceForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/InitMethodReferenceForm.java Thu Jan 31 02:04:05 2008
@@ -44,7 +44,7 @@
     protected int getPoolID() {
         return SegmentConstantPool.CP_METHOD;
     }
-    
+
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextInitRef();
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IntRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IntRefForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IntRefForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IntRefForm.java Thu Jan 31 02:04:05 2008
@@ -39,11 +39,11 @@
     public int getOperandType() {
         return TYPE_INTREF;
     }
-    
+
     public boolean hasIntRefOperand() {
         return true;
     }
-    
+
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextIntRef();
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LabelForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LabelForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LabelForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LabelForm.java Thu Jan 31 02:04:05 2008
@@ -28,7 +28,7 @@
 public class LabelForm extends ByteCodeForm {
 
     protected boolean widened = false;
-    
+
     public LabelForm(int opcode, String name, int[] rewrite) {
         super(opcode, name, rewrite);
         // TODO Auto-generated constructor stub
@@ -66,7 +66,7 @@
             byteCode.setNestedPositions(new int[][] {{0,2}});
         }
     }
-    
+
     /* (non-Javadoc)
      * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode, org.apache.harmony.pack200.bytecode.OperandTable, org.apache.harmony.pack200.SegmentConstantPool)
      */

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LocalForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LocalForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LocalForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LocalForm.java Thu Jan 31 02:04:05 2008
@@ -39,7 +39,7 @@
     public int getOperandType() {
         return TYPE_LOCAL;
     }
-    
+
     public boolean hasLocalOperand() {
         return true;
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LongForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LongForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LongForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LongForm.java Thu Jan 31 02:04:05 2008
@@ -25,7 +25,7 @@
  * long references).
  */
 public class LongForm extends ReferenceForm {
-    
+
     public LongForm(int opcode, String name, int[] rewrite) {
         super(opcode, name, rewrite);
         // TODO Auto-generated constructor stub
@@ -34,7 +34,7 @@
     public int getOperandType() {
         return TYPE_LONG;
     }
-    
+
     public boolean hasLongOperand() {
         return true;
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LookupSwitchForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LookupSwitchForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LookupSwitchForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LookupSwitchForm.java Thu Jan 31 02:04:05 2008
@@ -55,35 +55,35 @@
 
         // All this gets dumped into the rewrite bytes of the
         // poor bytecode.
-        
-        
+
+
         // Unlike most byte codes, the LookupSwitch is a
         // variable-sized bytecode. Because of this, the
         // rewrite array has to be defined here individually
         // for each bytecode, rather than in the ByteCodeForm
         // class.
-        
+
         // First, there's the bytecode. Then there are 0-3
         // bytes of padding so that the first (default)
         // label is on a 4-byte offset.
-        int padLength = 3 - (codeLength % 4); 
+        int padLength = 3 - (codeLength % 4);
         int rewriteSize = 1 + padLength + 4 // defaultbytes
             + 4 // npairs
             + (4 * case_values.length)
             + (4 * case_pcs.length);
-        
+
         int[] newRewrite = new int[rewriteSize];
         int rewriteIndex = 0;
-        
+
         // Fill in what we can now
         // opcode
         newRewrite[rewriteIndex++] = byteCode.getOpcode();
-        
+
         // padding
         for(int index=0; index < padLength; index++) {
             newRewrite[rewriteIndex++] = 0;
         }
-        
+
         // defaultbyte
         // This gets overwritten by fixUpByteCodeTargets
         newRewrite[rewriteIndex++] = -1;

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/MultiANewArrayForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/MultiANewArrayForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/MultiANewArrayForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/MultiANewArrayForm.java Thu Jan 31 02:04:05 2008
@@ -37,7 +37,7 @@
     public int getOperandType() {
         return TYPE_MULTIANEWARRAY;
     }
-    
+
     public boolean hasMultianewarrayOperand() {
         return true;
     }
@@ -54,7 +54,7 @@
         // multianewarray has a class ref and a dimension.
         // The superclass handles the class ref.
         super.setByteCodeOperands(byteCode, operandManager, codeLength);
-        
+
         // We have to handle the dimension.
         int dimension = operandManager.nextByte();
         byteCode.setOperandByte(dimension, 2);

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NewInitMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NewInitMethodRefForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NewInitMethodRefForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NewInitMethodRefForm.java Thu Jan 31 02:04:05 2008
@@ -16,6 +16,10 @@
  */
 package org.apache.harmony.pack200.bytecode.forms;
 
+import org.apache.harmony.pack200.Pack200Exception;
+import org.apache.harmony.pack200.SegmentConstantPool;
+import org.apache.harmony.pack200.bytecode.ByteCode;
+import org.apache.harmony.pack200.bytecode.ClassFileEntry;
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
@@ -34,12 +38,32 @@
     public int getOperandType() {
         return TYPE_NEWINITMETHODREF;
     }
-    
+
     public boolean hasNewInitMethodRefOperand() {
         return true;
     }
 
     protected String context(OperandManager operandManager) {
-        return operandManager.getNewClass();
+        String result = operandManager.getNewClass();
+        return result;
+    }
+
+    protected void setNestedEntries(ByteCode byteCode, OperandManager operandManager, int offset) throws Pack200Exception {
+        SegmentConstantPool globalPool = operandManager.globalConstantPool();
+        ClassFileEntry[] nested = null;
+        nested = new ClassFileEntry[] {
+                globalPool.getInitMethodPoolEntry(SegmentConstantPool.CP_METHOD, offset, context(operandManager))
+        };
+        if(nested[0] == null) {
+            // One class in JNDI isn't finding its
+            // <init> method. Not sure why.
+            // TODO: find out why.
+            // org/apache/harmony/security/asn1/ASN1Type
+            byteCode.setNested(new ClassFileEntry[]{});
+            byteCode.setNestedPositions(new int[][] {{}});
+            return;
+        }
+        byteCode.setNested(nested);
+        byteCode.setNestedPositions(new int[][] {{0, 2}});
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NoArgumentForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NoArgumentForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NoArgumentForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NoArgumentForm.java Thu Jan 31 02:04:05 2008
@@ -35,11 +35,11 @@
     public int getOperandType() {
         return TYPE_NONE;
     }
-    
+
     public boolean hasNoOperand() {
         return true;
     }
-    
+
     /* (non-Javadoc)
      * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode, org.apache.harmony.pack200.bytecode.OperandTable, org.apache.harmony.pack200.SegmentConstantPool)
      */

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ReferenceForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ReferenceForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ReferenceForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ReferenceForm.java Thu Jan 31 02:04:05 2008
@@ -35,7 +35,7 @@
 
     protected abstract int getPoolID();
     protected abstract int getOffset(OperandManager operandManager);
-    
+
     protected void setNestedEntries(ByteCode byteCode, OperandManager operandManager, int offset) throws Pack200Exception {
         SegmentConstantPool globalPool = operandManager.globalConstantPool();
         ClassFileEntry[] nested = null;

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ShortForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ShortForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ShortForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ShortForm.java Thu Jan 31 02:04:05 2008
@@ -33,7 +33,7 @@
     public int getOperandType() {
         return TYPE_SHORT;
     }
-    
+
     public boolean hasShortOperand() {
         return true;
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SingleByteReferenceForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SingleByteReferenceForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SingleByteReferenceForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SingleByteReferenceForm.java Thu Jan 31 02:04:05 2008
@@ -28,7 +28,7 @@
 public abstract class SingleByteReferenceForm extends ReferenceForm {
 
     protected boolean widened = false;
-    
+
     public SingleByteReferenceForm(int opcode, String name,
             int[] rewrite) {
         super(opcode, name, rewrite);
@@ -38,13 +38,13 @@
     protected abstract int getOffset(OperandManager operandManager);
 
     protected abstract int getPoolID();
-    
+
     protected void setNestedEntries(ByteCode byteCode, OperandManager operandManager, int offset) throws Pack200Exception {
         super.setNestedEntries(byteCode, operandManager, offset);
         if(widened) {
             byteCode.setNestedPositions(new int[][] {{0,2}});
         } else {
-            byteCode.setNestedPositions(new int[][] {{0,1}});            
+            byteCode.setNestedPositions(new int[][] {{0,1}});
         }
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/StringRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/StringRefForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/StringRefForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/StringRefForm.java Thu Jan 31 02:04:05 2008
@@ -55,7 +55,7 @@
     protected int getPoolID() {
         return SegmentConstantPool.CP_STRING;
     }
-    
+
     protected void setNestedEntries(ByteCode byteCode, OperandManager operandManager, int offset) throws Pack200Exception {
         SegmentConstantPool globalPool = operandManager.globalConstantPool();
         ClassFileEntry[] nested = null;
@@ -66,7 +66,7 @@
         if(widened) {
             byteCode.setNestedPositions(new int[][]{{0, 2}});
         } else {
-            byteCode.setNestedPositions(new int[][]{{0, 1}});            
+            byteCode.setNestedPositions(new int[][]{{0, 1}});
         }
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperFieldRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperFieldRefForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperFieldRefForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperFieldRefForm.java Thu Jan 31 02:04:05 2008
@@ -37,7 +37,7 @@
     public int getOperandType() {
         return TYPE_SUPERFIELDREF;
     }
-    
+
     public boolean hasSuperFieldRefOperand() {
         return true;
     }
@@ -49,7 +49,7 @@
     protected int getPoolID() {
         return SegmentConstantPool.CP_FIELD;
     }
-    
+
     protected String context(OperandManager operandManager) {
         return operandManager.getSuperClass();
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperInitMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperInitMethodRefForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperInitMethodRefForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperInitMethodRefForm.java Thu Jan 31 02:04:05 2008
@@ -23,7 +23,7 @@
  */
 public class SuperInitMethodRefForm extends InitMethodReferenceForm {
 
-    public SuperInitMethodRefForm(int opcode, String name, 
+    public SuperInitMethodRefForm(int opcode, String name,
             int[] rewrite) {
         super(opcode, name, rewrite);
         // TODO Auto-generated constructor stub
@@ -32,7 +32,7 @@
     public int getOperandType() {
         return TYPE_SUPERINITMETHODREF;
     }
-    
+
     public boolean hasSuperInitMethodRefOperand() {
         return true;
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperMethodRefForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperMethodRefForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperMethodRefForm.java Thu Jan 31 02:04:05 2008
@@ -37,11 +37,11 @@
     public int getOperandType() {
         return TYPE_SUPERMETHODREF;
     }
-    
+
     public boolean hasSuperMethodRefOperand() {
         return true;
     }
-    
+
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextSuperMethodRef();
     }
@@ -49,7 +49,7 @@
     protected int getPoolID() {
         return SegmentConstantPool.CP_METHOD;
     }
-    
+
     protected String context(OperandManager operandManager) {
         return operandManager.getSuperClass();
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SwitchForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SwitchForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SwitchForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SwitchForm.java Thu Jan 31 02:04:05 2008
@@ -35,18 +35,18 @@
     public int getOperandType() {
         return TYPE_SWITCH;
     }
-    
+
     public boolean hasSwitchOperand() {
         return true;
     }
-    
+
     /* (non-Javadoc)
      * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode, org.apache.harmony.pack200.bytecode.OperandTable, org.apache.harmony.pack200.SegmentConstantPool)
      */
     public void setByteCodeOperands(ByteCode byteCode,
             OperandManager operandManager, int codeLength) {
     }
-    
+
     /* (non-Javadoc)
      * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#fixUpByteCodeTargets(org.apache.harmony.pack200.bytecode.ByteCode, org.apache.harmony.pack200.bytecode.CodeAttribute)
      */
@@ -55,7 +55,7 @@
         int[] originalTargets = byteCode.getByteCodeTargets();
         int numberOfLabels = originalTargets.length;
         int[] replacementTargets = new int[numberOfLabels];
-        
+
         int sourceIndex = byteCode.getByteCodeIndex();
         int sourceValue = ((Integer)codeAttribute.byteCodeOffsets.get(sourceIndex)).intValue();
         for(int index=0; index < numberOfLabels; index++) {

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/TableSwitchForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/TableSwitchForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/TableSwitchForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/TableSwitchForm.java Thu Jan 31 02:04:05 2008
@@ -20,7 +20,7 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 public class TableSwitchForm extends SwitchForm {
-    
+
     public TableSwitchForm(int opcode, String name) {
         super(opcode, name);
     }
@@ -29,7 +29,7 @@
         super(opcode, name, rewrite);
     }
 
-    
+
     /* (non-Javadoc)
      * @see org.apache.harmony.pack200.bytecode.forms.SwitchForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode, org.apache.harmony.pack200.bytecode.OperandManager, int)
      */
@@ -63,28 +63,28 @@
         // rewrite array has to be defined here individually
         // for each bytecode, rather than in the ByteCodeForm
         // class.
-        
+
         // First, there's the bytecode. Then there are 0-3
         // bytes of padding so that the first (default)
         // label is on a 4-byte offset.
-        int padLength = 3 - (codeLength % 4); 
+        int padLength = 3 - (codeLength % 4);
         int rewriteSize = 1 + padLength + 4 // defaultbytes
             + 4 // lowbyte
             + 4 // highbyte
             + (4 * case_pcs.length);
-        
+
         int[] newRewrite = new int[rewriteSize];
         int rewriteIndex = 0;
-        
+
         // Fill in what we can now
         // opcode
         newRewrite[rewriteIndex++] = byteCode.getOpcode();
-        
+
         // padding
         for(int index=0; index < padLength; index++) {
             newRewrite[rewriteIndex++] = 0;
         }
-        
+
         // defaultbyte
         // This gets overwritten by fixUpByteCodeTargets
         newRewrite[rewriteIndex++] = -1;

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisFieldRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisFieldRefForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisFieldRefForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisFieldRefForm.java Thu Jan 31 02:04:05 2008
@@ -49,7 +49,7 @@
     protected int getPoolID() {
         return SegmentConstantPool.CP_FIELD;
     }
-    
+
     protected String context(OperandManager operandManager) {
         return operandManager.getCurrentClass();
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisMethodRefForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisMethodRefForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisMethodRefForm.java Thu Jan 31 02:04:05 2008
@@ -28,7 +28,7 @@
  */
 public class ThisMethodRefForm extends ClassSpecificReferenceForm {
 
-    public ThisMethodRefForm(int opcode, String name, 
+    public ThisMethodRefForm(int opcode, String name,
             int[] rewrite) {
         super(opcode, name, rewrite);
         // TODO Auto-generated constructor stub
@@ -37,11 +37,11 @@
     public int getOperandType() {
         return TYPE_THISMETHODREF;
     }
-    
+
     public boolean hasThisMethodRefOperand() {
         return true;
     }
-    
+
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextThisMethodRef();
     }
@@ -49,7 +49,7 @@
     protected int getPoolID() {
         return SegmentConstantPool.CP_METHOD;
     }
-    
+
     protected String context(OperandManager operandManager) {
         return operandManager.getCurrentClass();
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/VariableInstructionForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/VariableInstructionForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/VariableInstructionForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/VariableInstructionForm.java Thu Jan 31 02:04:05 2008
@@ -37,7 +37,7 @@
      * the next available operand position and the three
      * immediately following it to a highest-byte,
      * mid-high, mid-low, low-byte encoding of the operand.
-     *  
+     *
      *  Note that unlike the ByteCode setOperand* operations, this
      *  starts with an actual bytecode rewrite array (rather than
      *  a ByteCodeForm prototype rewrite array). Also, this method
@@ -50,13 +50,13 @@
      *  Calling setRewrite4Bytes(0, rewrite) a second time will
      *  convert it to:
      *  {100, 0, 0, 0, 0, 200, 0, 0, 0, 0}
-     * 
+     *
      * @param operand int to set the rewrite bytes to
      * @param rewrite int[] bytes to rewrite
      */
     public void setRewrite4Bytes(int operand, int[] rewrite) {
         int firstOperandPosition = -1;
-        
+
         // Find the first -1 in the rewrite array
         for(int index=0; index < rewrite.length - 3; index++) {
             if((rewrite[index] == -1)
@@ -75,7 +75,7 @@
      * the next available operand position and the byte
      * immediately following it to a high-byte,
      * low-byte encoding of the operand.
-     *  
+     *
      *  Note that unlike the ByteCode setOperand* operations, this
      *  starts with an actual bytecode rewrite array (rather than
      *  a ByteCodeForm prototype rewrite array). Also, this method
@@ -88,13 +88,13 @@
      *  Calling setRewrite2Bytes(0, rewrite) a second time will
      *  convert it to:
      *  {100, 0, 0, 0, 0, 200, -1, -1, -1, -1}
-     * 
+     *
      * @param operand int to set the rewrite bytes to
      * @param rewrite int[] bytes to rewrite
      */
     public void setRewrite2Bytes(int operand, int[] rewrite) {
         int firstOperandPosition = -1;
-        
+
         // Find the first -1 in the rewrite array
         for(int index=0; index < rewrite.length - 3; index++) {
             if((rewrite[index] == -1)
@@ -119,13 +119,13 @@
         if(absPosition < 0) {
             throw new Error("Trying to rewrite " + this + " but there is no room for 4 bytes");
         }
-        
+
         int byteCodeRewriteLength = rewrite.length;
-        
+
         if(absPosition + 3 > byteCodeRewriteLength) {
             throw new Error("Trying to rewrite " + this + " with an int at position " + absPosition + " but this won't fit in the rewrite array");
         }
-    
+
         rewrite[absPosition] = ((0xFF000000) & operand) >> 24;
         rewrite[absPosition + 1] = ((0x00FF0000) & operand) >> 16;
         rewrite[absPosition + 2] = ((0x0000FF00) & operand) >> 8;
@@ -145,13 +145,13 @@
         if(absPosition < 0) {
             throw new Error("Trying to rewrite " + this + " but there is no room for 4 bytes");
         }
-        
+
         int byteCodeRewriteLength = rewrite.length;
-        
+
         if(absPosition + 1 > byteCodeRewriteLength) {
             throw new Error("Trying to rewrite " + this + " with an int at position " + absPosition + " but this won't fit in the rewrite array");
         }
-    
+
         rewrite[absPosition] = ((0xFF00) & operand) >> 8;
         rewrite[absPosition + 1] = ((0x00FF) & operand);
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/WideForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/WideForm.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/WideForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/WideForm.java Thu Jan 31 02:04:05 2008
@@ -38,7 +38,7 @@
     public int getOperandType() {
         return TYPE_WIDE;
     }
-    
+
     public boolean hasWideOperand() {
         return true;
     }
@@ -67,7 +67,7 @@
      */
     protected void setByteCodeOperandsFormat1(int instruction, ByteCode byteCode,
             OperandManager operandManager, int codeLength) {
-        
+
         // Even though this code is really similar to the
         // code for setByteCodeOperandsFormat2, I've left it
         // distinct here. This is so changing one will
@@ -76,31 +76,31 @@
         // differ, so an updater will not have to disentangle
         // it.
         int local = operandManager.nextLocal();
-        
+
         // Unlike most byte codes, the wide bytecode is a
         // variable-sized bytecode. Because of this, the
         // rewrite array has to be defined here individually
         // for each bytecode, rather than in the ByteCodeForm
         // class.
-        
+
         int[] newRewrite = new int[4];
         int rewriteIndex = 0;
-        
+
         // Fill in what we can now
         // wide opcode
         newRewrite[rewriteIndex++] = byteCode.getOpcode();
-        
+
         // "real" instruction that is widened
         newRewrite[rewriteIndex++] = instruction;
 
         // Index bytes
         setRewrite2Bytes(local, rewriteIndex, newRewrite);
         rewriteIndex +=2;
-        
+
         byteCode.setRewrite(newRewrite);
     }
 
-    
+
     /**
      * This method sets the rewrite array for the bytecode
      * using Format 2 of the JVM spec: an opcode, two index
@@ -112,34 +112,34 @@
      */
     protected void setByteCodeOperandsFormat2(int instruction, ByteCode byteCode,
             OperandManager operandManager, int codeLength) {
-    
-        int local = operandManager.nextLocal();        
+
+        int local = operandManager.nextLocal();
         int constWord = operandManager.nextShort();
-        
+
         // Unlike most byte codes, the wide bytecode is a
         // variable-sized bytecode. Because of this, the
         // rewrite array has to be defined here individually
         // for each bytecode, rather than in the ByteCodeForm
         // class.
-        
+
         int[] newRewrite = new int[6];
         int rewriteIndex = 0;
-        
+
         // Fill in what we can now
         // wide opcode
         newRewrite[rewriteIndex++] = byteCode.getOpcode();
-        
+
         // "real" instruction that is widened
         newRewrite[rewriteIndex++] = instruction;
 
         // Index bytes
         setRewrite2Bytes(local, rewriteIndex, newRewrite);
         rewriteIndex +=2;
-        
+
         // constant bytes
         setRewrite2Bytes(constWord, rewriteIndex, newRewrite);
         rewriteIndex += 2; // not strictly necessary, but just in case something comes along later
-        
+
         byteCode.setRewrite(newRewrite);
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java Thu Jan 31 02:04:05 2008
@@ -49,7 +49,7 @@
 		support.removePropertyChangeListener(listener);
 	}
 
-	/** 
+	/**
 	 * Completion between 0..1
 	 * @param value
 	 */

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200UnpackerAdapter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200UnpackerAdapter.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200UnpackerAdapter.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200UnpackerAdapter.java Thu Jan 31 02:04:05 2008
@@ -36,7 +36,7 @@
 public class Pack200UnpackerAdapter extends Pack200Adapter implements Unpacker {
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.util.jar.Pack200.Unpacker#unpack(java.io.InputStream,
 	 *      java.util.jar.JarOutputStream)
 	 */
@@ -60,7 +60,7 @@
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.util.jar.Pack200.Unpacker#unpack(java.io.File,
 	 *      java.util.jar.JarOutputStream)
 	 */

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AbstractBandsTestCase.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AbstractBandsTestCase.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AbstractBandsTestCase.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AbstractBandsTestCase.java Thu Jan 31 02:04:05 2008
@@ -37,7 +37,7 @@
         public int getClassCount() {
             return numClasses;
         }
-        
+
         public SegmentOptions getOptions() {
             try {
                 return new SegmentOptions(0);
@@ -52,7 +52,7 @@
         public MockAttributeDefinitionBands(Segment segment) {
             super(segment);
         }
-        
+
         public AttributeLayoutMap getAttributeDefinitionMap() {
             try {
                 return new AttributeLayoutMap();
@@ -61,21 +61,21 @@
             }
             return null;
         }
-        
-       
+
+
 
     }
 
     public class MockSegment extends Segment {
-        
+
         protected AttrDefinitionBands getAttrDefinitionBands() {
             return new MockAttributeDefinitionBands(this);
-        }     
-        
+        }
+
         public SegmentHeader getSegmentHeader() {
             return new MockSegmentHeader();
         }
     }
-    
-    
+
+
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AttributeLayoutMapTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AttributeLayoutMapTest.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AttributeLayoutMapTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AttributeLayoutMapTest.java Thu Jan 31 02:04:05 2008
@@ -43,6 +43,6 @@
 		layout = b.getAttributeLayout("SourceFile", AttributeLayout.CONTEXT_CLASS);
 		assertNotNull(layout);
 		assertEquals("RUNH",layout.getLayout());
-		
+
 	}
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AttributeLayoutTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AttributeLayoutTest.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AttributeLayoutTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AttributeLayoutTest.java Thu Jan 31 02:04:05 2008
@@ -45,7 +45,7 @@
 						return null;
 					return data[cp][(int)index];
 				}
-				
+
 			};
 		}
 	}

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BHSDCodecTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BHSDCodecTest.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BHSDCodecTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BHSDCodecTest.java Thu Jan 31 02:04:05 2008
@@ -30,12 +30,12 @@
  */
 public class BHSDCodecTest extends TestCase {
 
-    
+
     public void testEncodeDecode() throws IOException, Pack200Exception {
         for (int i = 1; i < 116; i++) {
-            
+
             BHSDCodec codec = (BHSDCodec) CodecEncoding.getCodec(i, null, null);
-            
+
             // Test encode-decode with a selection of numbers within the range of the codec
             long delta = (codec.largest() - codec.smallest()) / 4;
             for (long j = codec.smallest(); j <= codec.largest() + 1; j += delta) {
@@ -47,11 +47,11 @@
                             + ", got: " + decoded);
                 }
             }
-            
-            // Test encode-decode with 0            
+
+            // Test encode-decode with 0
             assertEquals(0, codec.decode(new ByteArrayInputStream(codec.encode(
                     0, 0)), 0));
         }
     }
-    
+
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BandSetTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BandSetTest.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BandSetTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BandSetTest.java Thu Jan 31 02:04:05 2008
@@ -31,7 +31,7 @@
 import org.apache.harmony.pack200.SegmentHeader;
 
 public class BandSetTest extends TestCase {
-    
+
     public class MockSegment extends Segment {
         public SegmentHeader getSegmentHeader() {
             return new SegmentHeader();
@@ -45,9 +45,9 @@
 
         public void unpack(InputStream inputStream) throws IOException, Pack200Exception {
         }
-        
+
     };
-    
+
     public void testDecodeBandInt() throws IOException, Pack200Exception {
         BHSDCodec codec = Codec.BYTE1;
         byte[] bytes = new byte[]{(byte)3,(byte)56,(byte)122,(byte)78};
@@ -57,7 +57,7 @@
             assertEquals("Wrong value in position " + i, ints[i], bytes[i]);
         }
     }
-    
+
     public void testDecodeBandLong() throws IOException, Pack200Exception {
         BHSDCodec codec = Codec.BYTE1;
         byte[] bytes = new byte[]{(byte)3,(byte)56,(byte)122,(byte)78, (byte)0, (byte)255};
@@ -65,39 +65,39 @@
         long[] longs = bandSet.decodeBandLong("Test Band", in, codec, 6);
         for (int i = 0; i < longs.length; i++) {
             assertEquals("Wrong value in position " + i, (byte)longs[i], bytes[i]);
-        }        
+        }
         //TODO: Should test this with other Codecs.
     }
-    
+
     public void testDecodeBandLong2() throws IOException, Pack200Exception {
-        
+
         BHSDCodec codec = Codec.DELTA5;
         byte[] bytes = new byte[]{3, 1, 2, 3, 4, 5}; // 3 is decoded to -2 by DELTA5, which signifies a switch to BYTE1
         InputStream in = new ByteArrayInputStream(bytes);
         long[] longs = bandSet.decodeBandLong("Test Band", in, codec, 5);
         for (int i = 0; i < longs.length; i++) {
             assertEquals("Wrong value in position " + i, longs[i], bytes[i + 1]);
-        }    
+        }
     }
-    
+
     public void testParseFlags1() {
-        
+
     }
-    
+
     public void testParseFlags2() {
-        
+
     }
-    
+
     public void testParseFlags3() {
-        
+
     }
-    
+
     public void testParseReferences1() {
-        
+
     }
-    
+
     public void testParseReferences2() {
-        
+
     }
 
 }



Mime
View raw message